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: remove sysfs entry that was used to set the number of vfs igbvf: add new driver to support 82576 virtual functions drivers/net/eql.c: Fix a dev leakage. niu: Fix unused variable warning. r6040: set MODULE_VERSION bnx2: Don't use reserved names FEC driver: add missing #endif niu: Fix error handling mv643xx_eth: don't reset the rx coal timer on interface up smsc911x: correct debugging message on mii read timeout ethoc: fix library build errors netfilter: ctnetlink: fix regression in expectation handling netfilter: fix selection of "LED" target in netfilter netfilter: ip6tables regression fix
Showing
- drivers/net/Kconfig 23 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/bnx2.c 13 additions, 13 deletionsdrivers/net/bnx2.c
- drivers/net/eql.c 2 additions, 0 deletionsdrivers/net/eql.c
- drivers/net/fec.c 1 addition, 0 deletionsdrivers/net/fec.c
- drivers/net/igb/igb_main.c 54 additions, 105 deletionsdrivers/net/igb/igb_main.c
- drivers/net/igbvf/Makefile 38 additions, 0 deletionsdrivers/net/igbvf/Makefile
- drivers/net/igbvf/defines.h 125 additions, 0 deletionsdrivers/net/igbvf/defines.h
- drivers/net/igbvf/ethtool.c 540 additions, 0 deletionsdrivers/net/igbvf/ethtool.c
- drivers/net/igbvf/igbvf.h 335 additions, 0 deletionsdrivers/net/igbvf/igbvf.h
- drivers/net/igbvf/mbx.c 350 additions, 0 deletionsdrivers/net/igbvf/mbx.c
- drivers/net/igbvf/mbx.h 75 additions, 0 deletionsdrivers/net/igbvf/mbx.h
- drivers/net/igbvf/netdev.c 2919 additions, 0 deletionsdrivers/net/igbvf/netdev.c
- drivers/net/igbvf/regs.h 108 additions, 0 deletionsdrivers/net/igbvf/regs.h
- drivers/net/igbvf/vf.c 398 additions, 0 deletionsdrivers/net/igbvf/vf.c
- drivers/net/igbvf/vf.h 265 additions, 0 deletionsdrivers/net/igbvf/vf.h
- drivers/net/mv643xx_eth.c 2 additions, 2 deletionsdrivers/net/mv643xx_eth.c
- drivers/net/niu.c 2 additions, 1 deletiondrivers/net/niu.c
- drivers/net/r6040.c 1 addition, 0 deletionsdrivers/net/r6040.c
- drivers/net/smsc911x.c 1 addition, 1 deletiondrivers/net/smsc911x.c
Loading
Please register or sign in to comment