1. 16 May, 2010 9 commits
  2. 14 May, 2010 23 commits
  3. 13 May, 2010 8 commits
    • David S. Miller's avatar
    • Joe Perches's avatar
      netfilter: remove unnecessary returns from void function()s · 736d58e3
      Joe Perches authored
      This patch removes from net/ netfilter files
      all the unnecessary return; statements that precede the
      last closing brace of void functions.
      
      It does not remove the returns that are immediately
      preceded by a label as gcc doesn't like that.
      
      Done via:
      $ grep -rP --include=*.[ch] -l "return;\n}" net/ | \
        xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }'
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      [Patrick: changed to keep return statements in otherwise empty function bodies]
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      736d58e3
    • Stephen Hemminger's avatar
      netfilter: cleanup printk messages · 654d0fbd
      Stephen Hemminger authored
      Make sure all printk messages have a severity level.
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      654d0fbd
    • Stephen Hemminger's avatar
      netfilter: change NF_ASSERT to WARN_ON · af567603
      Stephen Hemminger authored
      Change netfilter asserts to standard WARN_ON. This has the
      benefit of backtrace info and also causes netfilter errors
      to show up on kerneloops.org.
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      af567603
    • Bart De Schuymer's avatar
      netfilter: bridge-netfilter: fix crash in br_nf_forward_finish() · e94c6743
      Bart De Schuymer authored
      [ 4593.956206] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
      [ 4593.956219] IP: [<ffffffffa03357a4>] br_nf_forward_finish+0x154/0x170 [bridge]
      [ 4593.956232] PGD 195ece067 PUD 1ba005067 PMD 0
      [ 4593.956241] Oops: 0000 [#1] SMP
      [ 4593.956248] last sysfs file:
      /sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:08/ATK0110:00/hwmon/hwmon0/temp2_label
      [ 4593.956253] CPU 3
      ...
      [ 4593.956380] Pid: 29512, comm: kvm Not tainted 2.6.34-rc7-net #195 P6T DELUXE/System Product Name
      [ 4593.956384] RIP: 0010:[<ffffffffa03357a4>]  [<ffffffffa03357a4>] br_nf_forward_finish+0x154/0x170 [bridge]
      [ 4593.956395] RSP: 0018:ffff880001e63b78  EFLAGS: 00010246
      [ 4593.956399] RAX: 0000000000000608 RBX: ffff880057181700 RCX: ffff8801b813d000
      [ 4593.956402] RDX: 0000000000000000 RSI: 0000000000000002 RDI: ffff880057181700
      [ 4593.956406] RBP: ffff880001e63ba8 R08: ffff8801b9d97000 R09: ffffffffa0335650
      [ 4593.956410] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8801b813d000
      [ 4593.956413] R13: ffffffff81ab3940 R14: ffff880057181700 R15: 0000000000000002
      [ 4593.956418] FS:  00007fc40d380710(0000) GS:ffff880001e60000(0000) knlGS:0000000000000000
      [ 4593.956422] CS:  0010 DS: 002b ES: 002b CR0: 000000008005003b
      [ 4593.956426] CR2: 0000000000000018 CR3: 00000001ba1d7000 CR4: 00000000000026e0
      [ 4593.956429] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      [ 4593.956433] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      [ 4593.956437] Process kvm (pid: 29512, threadinfo ffff8801ba566000, task ffff8801b8003870)
      [ 4593.956441] Stack:
      [ 4593.956443]  0000000100000020 ffff880001e63ba0 ffff880001e63ba0 ffff880057181700
      [ 4593.956451] <0> ffffffffa0335650 ffffffff81ab3940 ffff880001e63bd8 ffffffffa03350e6
      [ 4593.956462] <0> ffff880001e63c40 000000000000024d ffff880057181700 0000000080000000
      [ 4593.956474] Call Trace:
      [ 4593.956478]  <IRQ>
      [ 4593.956488]  [<ffffffffa0335650>] ? br_nf_forward_finish+0x0/0x170 [bridge]
      [ 4593.956496]  [<ffffffffa03350e6>] NF_HOOK_THRESH+0x56/0x60 [bridge]
      [ 4593.956504]  [<ffffffffa0335282>] br_nf_forward_arp+0x112/0x120 [bridge]
      [ 4593.956511]  [<ffffffff813f7184>] nf_iterate+0x64/0xa0
      [ 4593.956519]  [<ffffffffa032f920>] ? br_forward_finish+0x0/0x60 [bridge]
      [ 4593.956524]  [<ffffffff813f722c>] nf_hook_slow+0x6c/0x100
      [ 4593.956531]  [<ffffffffa032f920>] ? br_forward_finish+0x0/0x60 [bridge]
      [ 4593.956538]  [<ffffffffa032f800>] ? __br_forward+0x0/0xc0 [bridge]
      [ 4593.956545]  [<ffffffffa032f86d>] __br_forward+0x6d/0xc0 [bridge]
      [ 4593.956550]  [<ffffffff813c5d8e>] ? skb_clone+0x3e/0x70
      [ 4593.956557]  [<ffffffffa032f462>] deliver_clone+0x32/0x60 [bridge]
      [ 4593.956564]  [<ffffffffa032f6b6>] br_flood+0xa6/0xe0 [bridge]
      [ 4593.956571]  [<ffffffffa032f800>] ? __br_forward+0x0/0xc0 [bridge]
      
      Don't call nf_bridge_update_protocol() for ARP traffic as skb->nf_bridge isn't
      used in the ARP case.
      Reported-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: default avatarBart De Schuymer <bdschuym@pandora.be>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      e94c6743
    • Dimitris Michailidis's avatar
    • Dimitris Michailidis's avatar
      cxgb4: report the PCIe link speed · f1a051b9
      Dimitris Michailidis authored
      Report the PCIe link speed (2.5 or 5 Gbps).
      Signed-off-by: default avatarDimitris Michailidis <dm@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f1a051b9
    • Dimitris Michailidis's avatar
      cxgb4: configure HW VLAN extraction through FW · f8f5aafa
      Dimitris Michailidis authored
      HW VLAN extraction needs to be configured through FW to work correctly in
      virtualization environments.  Remove the direct register manipulation and
      rely on FW.
      Signed-off-by: default avatarDimitris Michailidis <dm@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f8f5aafa