linux.git/net, branch v2.6.29-rc2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2009-01-16T00:53:15+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (95 commits)
  b44: GFP_DMA skb should not escape from driver
  korina: do not use IRQF_SHARED with IRQF_DISABLED
  korina: do not stop queue here
  korina: fix handling tx_chain_tail
  korina: do tx at the right position
  korina: do schedule napi after testing for it
  korina: rework korina_rx() for use with napi
  korina: disable napi on close and restart
  korina: reset resource buffer size to 1536
  korina: fix usage of driver_data
  bnx2x: First slow path interrupt race
  bnx2x: MTU Filter
  bnx2x: Indirection table initialization index
  bnx2x: Missing brackets
  bnx2x: Fixing the doorbell size
  bnx2x: Endianness issues
  bnx2x: VLAN tagged packets without VLAN offload
  bnx2x: Protecting the link change indication
  bnx2x: Flow control updated before reporting the link
  bnx2x: Missing mask when calculating flow control
  ...

9p: disallow RDMA if RDMA CM isn't available

2009-01-16T00:39:42+00:00

If INET=y and INFINIBAND=y, but IPV6=m then INFINIBAND_ADDR_TRANS is set
to n and the RDMA CM functions rdma_connect() et al are not built.
However, the current config dependencies allow NET_9P_RDMA to be selected
in this, which leads to a build failure.  Fix this by adding a dependency
on INFINIBAND_ADDR_TRANS to disallow NET_9P_RDMA in this case.

Reported-by: Randy Dunlap 
Signed-off-by: Roland Dreier 
Acked-by: Randy Dunlap 
Tested-by: Randy Dunlap 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

can: fix slowpath issue in hrtimer callback function

2009-01-15T05:06:55+00:00

Due to the loopback functionality in can_send() we can not invoke it
from hardirq context which was done inside the
bcm_tx_timeout_handler() hrtimer callback:

[  700.361154]  [] warn_slowpath+0x80/0xb6
[  700.361163]  [] valid_state+0x125/0x136
[  700.361171]  [] mark_lock+0x18e/0x332
[  700.361180]  [] __lock_acquire+0x12e/0xb1e
[  700.361189]  [] bcm_tx_timeout_handler+0x0/0xbc [can_bcm]
[  700.361198]  [] dev_queue_xmit+0x191/0x479
[  700.361206]  [] __local_bh_disable+0x2b/0x64
[  700.361213]  [] dev_queue_xmit+0x191/0x479
[  700.361225]  [] can_send+0xd7/0x11a [can]
[  700.361235]  [] bcm_can_tx+0x9d/0xd9 [can_bcm]
[  700.361245]  [] bcm_tx_timeout_handler+0x6a/0xbc [can_bcm]
[  700.361255]  [] bcm_tx_timeout_handler+0x0/0xbc [can_bcm]
[  700.361263]  [] __run_hrtimer+0x5a/0x86
[  700.361273]  [] bcm_tx_timeout_handler+0x0/0xbc [can_bcm]
[  700.361282]  [] hrtimer_interrupt+0xb9/0x110

This patch moves the rest of the functionality from the hrtimer
callback to the already existing tasklet to fix this slowpath problem.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

net: Add init_dummy_netdev() and fix EMAC driver using it

2009-01-15T05:05:05+00:00

This adds an init_dummy_netdev() function that gets a network device
structure (allocation and lifetime entirely under caller's control) and
initialize the minimum amount of fields so it can be used to schedule
NAPI polls without registering a full blown interface. This is to be
used by drivers that need to tie several hardware interfaces to a single
NAPI poll scheduler due to HW limitations.

It also updates the ibm_newemac driver to use that, this fixing the
oops on 2.6.29 due to passing NULL as "dev" to netif_napi_add()

Symbol is exported GPL only a I don't think we want binary drivers doing
that sort of acrobatics (if we want them at all).

Signed-off-by: Benjamin Herrenschmidt 
Tested-by: Geert Uytterhoeven 
Signed-off-by: David S. Miller

gso: Ensure that the packet is long enough

2009-01-15T04:41:12+00:00

When we get a GSO packet from an untrusted source, we need to
ensure that it is sufficiently long so that we don't end up
crashing.

Based on discovery and patch by Ian Campbell.

Signed-off-by: Herbert Xu 
Tested-by: Ian Campbell 
Signed-off-by: David S. Miller

gro: Fix page ref count for skbs freed normally

2009-01-15T04:40:03+00:00

When an skb with page frags is merged into an existing one, we
cannibalise its reference count.  This is OK when the skb is
reused because we set nr_frags to zero in that case.  However,
for the case where the skb is freed through kfree_skb, we didn't
clear nr_frags which causes the page to be freed prematurely.

This is fixed by moving the skb resetting into skb_gro_receive.

Reported-by: Jeff Kirsher 
Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

xfrm: For 32/64 compatability wrt. xfrm_usersa_info

2009-01-14T22:55:35+00:00

Reported by Jiri Klimes.

Fix suggested by Patrick McHardy.

Signed-off-by: David S. Miller

gro: Check for GSO packets and packets with frag_list

2009-01-14T22:36:12+00:00

As GRO cannot be applied to packets with frag_list we need to
make sure that we reject such packets if they are fed to us,
e.g., through a tunnel device.

Also there is no point in applying GRO on GSO packets so they
too should be rejected.  This allows GRO to be used in virtio-net
which may produce GSO packets directly but may still benefit
from GRO if the other end of it doesn't support GSO.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

[CVE-2009-0029] System call wrappers part 22

2009-01-14T13:15:27+00:00

Signed-off-by: Heiko Carstens

[CVE-2009-0029] System call wrappers part 21

2009-01-14T13:15:26+00:00

Signed-off-by: Heiko Carstens