Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: igb: fix link reporting when using sgmii igb: prevent skb_over panic w/ mtu smaller than 1K igb: Fix DCA errors and do not use context index for 82576 ipv6: compile fix for ip6mr.c packet: Avoid lock_sock in mmap handler sfc: Replace stats_enabled flag with a disable count sfc: SFX7101/SFT9001: Fix AN advertisements sfc: SFT9001: Always enable XNP exchange on SFT9001 rev B sfc: Update board info for hardware monitor on SFN4111T-R5 and later sfc: Test for PHYXS faults whenever we cannot test link state bits sfc: Reinitialise the PHY completely in case of a PHY or NIC reset sfc: Fix post-reset MAC selection sfc: SFN4111T: Fix GPIO sharing between I2C and FLASH_CFG_1 sfc: SFT9001: Fix speed reporting in 1G PHY loopback sfc: SFX7101: Remove workaround for bad link training sfc: SFT9001: Enable robust link training sky2: fix hard hang with netconsoling and iface going up
Showing
- drivers/net/igb/e1000_82575.c 9 additions, 2 deletionsdrivers/net/igb/e1000_82575.c
- drivers/net/igb/igb.h 4 additions, 5 deletionsdrivers/net/igb/igb.h
- drivers/net/igb/igb_main.c 10 additions, 14 deletionsdrivers/net/igb/igb_main.c
- drivers/net/sfc/efx.c 41 additions, 18 deletionsdrivers/net/sfc/efx.c
- drivers/net/sfc/efx.h 6 additions, 3 deletionsdrivers/net/sfc/efx.h
- drivers/net/sfc/ethtool.c 0 additions, 3 deletionsdrivers/net/sfc/ethtool.c
- drivers/net/sfc/falcon.c 18 additions, 14 deletionsdrivers/net/sfc/falcon.c
- drivers/net/sfc/mdio_10g.c 89 additions, 102 deletionsdrivers/net/sfc/mdio_10g.c
- drivers/net/sfc/mdio_10g.h 2 additions, 1 deletiondrivers/net/sfc/mdio_10g.h
- drivers/net/sfc/net_driver.h 4 additions, 5 deletionsdrivers/net/sfc/net_driver.h
- drivers/net/sfc/phy.h 0 additions, 1 deletiondrivers/net/sfc/phy.h
- drivers/net/sfc/selftest.c 4 additions, 3 deletionsdrivers/net/sfc/selftest.c
- drivers/net/sfc/sfe4001.c 33 additions, 9 deletionsdrivers/net/sfc/sfe4001.c
- drivers/net/sfc/tenxpress.c 77 additions, 136 deletionsdrivers/net/sfc/tenxpress.c
- drivers/net/sfc/workarounds.h 5 additions, 7 deletionsdrivers/net/sfc/workarounds.h
- drivers/net/sky2.c 3 additions, 3 deletionsdrivers/net/sky2.c
- net/ipv6/ip6mr.c 1 addition, 0 deletionsnet/ipv6/ip6mr.c
- net/packet/af_packet.c 7 additions, 2 deletionsnet/packet/af_packet.c
Loading
Please register or sign in to comment