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: ehea: Fix a checksum issue on the receive path net: allow FEC driver to use fixed PHY support tg3: restore rx_dropped accounting b44: fix carrier detection on bind net: clear heap allocations for privileged ethtool actions NET: wimax, fix use after free ATM: iphase, remove sleep-inside-atomic ATM: mpc, fix use after free ATM: solos-pci, remove use after free net/fec: carrier off initially to avoid root mount failure r8169: use device model DMA API r8169: allocate with GFP_KERNEL flag when able to sleep
No related branches found
No related tags found
Showing
- drivers/atm/iphase.c 0 additions, 6 deletionsdrivers/atm/iphase.c
- drivers/atm/iphase.h 1 addition, 1 deletiondrivers/atm/iphase.h
- drivers/atm/solos-pci.c 5 additions, 3 deletionsdrivers/atm/solos-pci.c
- drivers/net/b44.c 2 additions, 2 deletionsdrivers/net/b44.c
- drivers/net/ehea/ehea_main.c 8 additions, 1 deletiondrivers/net/ehea/ehea_main.c
- drivers/net/ehea/ehea_qmr.h 1 addition, 0 deletionsdrivers/net/ehea/ehea_qmr.h
- drivers/net/fec.c 30 additions, 14 deletionsdrivers/net/fec.c
- drivers/net/r8169.c 35 additions, 30 deletionsdrivers/net/r8169.c
- drivers/net/tg3.c 4 additions, 2 deletionsdrivers/net/tg3.c
- drivers/net/tg3.h 1 addition, 1 deletiondrivers/net/tg3.h
- drivers/net/wimax/i2400m/rx.c 13 additions, 13 deletionsdrivers/net/wimax/i2400m/rx.c
- net/atm/mpc.c 1 addition, 1 deletionnet/atm/mpc.c
- net/core/ethtool.c 3 additions, 3 deletionsnet/core/ethtool.c
Loading
Please register or sign in to comment