[GIT] Networking

David Miller
2011-10-11T19:54:22Z

Just a few driver bugs, and one missing state update during ipv6 GRO processing.

1) When iSCSI and FCOE are both in use, bnx2x allocated conflicting client IDs.
Fix from Dmitry Kravkov.

2) MSCAN CAN driver copies one byte to many on odd packet lengths, fix from
Wolfgang Grandegger.

3) Blue frame support in mlx4_en driver is busted on PowerPC due to endian
bugs, fix from Thadeu Lima de Souza Cascardo.

4) When GRO pulls ipv6 extension headers, the protocol value changes,
so it has to reload the protocol ops pointer. Fix from Zheng Yan.

Please pull, thanks a lot!

The following changes since commit 65112dccf8a113737684366349d7f9ec373ddc47:

Merge git://git.samba.org/sfrench/cifs-2.6 (2011-10-10 14:53:11 +1200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

Dmitry Kravkov (1):
bnx2x: fix cl_id allocation for non-eth clients for NPAR mode

Thadeu Lima de Souza Cascardo (1):
mlx4_en: fix endianness with blue frame support

Wolfgang Grandegger (1):
mscan: too much data copied to CAN frame due to 16 bit accesses

Yan, Zheng (1):
gro: refetch inet6_protos[] after pulling ext headers

drivers/net/bnx2x/bnx2x.h | 20 +++++++++++++-------
drivers/net/bnx2x/bnx2x_cmn.h | 2 +-
drivers/net/can/mscan/mscan.c | 11 ++++++++---
drivers/net/mlx4/en_tx.c | 6 +++---
net/ipv6/af_inet6.c | 1 +
5 files changed, 26 insertions(+), 14 deletions(-)