Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (32 commits) tg3: Remove 5719 jumbo frames and TSO blocks tg3: Break larger frags into 4k chunks for 5719 tg3: Add tx BD budgeting code tg3: Consolidate code that calls tg3_tx_set_bd() tg3: Add partial fragment unmapping code tg3: Generalize tg3_skb_error_unmap() tg3: Remove short DMA check for 1st fragment tg3: Simplify tx bd assignments tg3: Reintroduce tg3_tx_ring_info ASIX: Use only 11 bits of header for data size ASIX: Simplify condition in rx_fixup() Fix cdc-phonet build bonding: reduce noise during init bonding: fix string comparison errors net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared net: add IFF_SKB_TX_SHARED flag to priv_flags net: sock_sendmsg_nosec() is static forcedeth: fix vlans gianfar: fix bug caused by 87c288c6 gro: Only reset frag0 when skb can be pulled ...
No related branches found
No related tags found
Showing
- drivers/isdn/i4l/isdn_net.c 3 additions, 0 deletionsdrivers/isdn/i4l/isdn_net.c
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/acenic.c 24 additions, 21 deletionsdrivers/net/acenic.c
- drivers/net/acenic.h 3 additions, 3 deletionsdrivers/net/acenic.h
- drivers/net/bonding/bond_main.c 5 additions, 3 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/bonding/bond_sysfs.c 71 additions, 62 deletionsdrivers/net/bonding/bond_sysfs.c
- drivers/net/forcedeth.c 13 additions, 3 deletionsdrivers/net/forcedeth.c
- drivers/net/gianfar.c 1 addition, 5 deletionsdrivers/net/gianfar.c
- drivers/net/ifb.c 1 addition, 1 deletiondrivers/net/ifb.c
- drivers/net/macvlan.c 1 addition, 1 deletiondrivers/net/macvlan.c
- drivers/net/tg3.c 173 additions, 114 deletionsdrivers/net/tg3.c
- drivers/net/tg3.h 8 additions, 1 deletiondrivers/net/tg3.h
- drivers/net/tun.c 1 addition, 0 deletionsdrivers/net/tun.c
- drivers/net/usb/asix.c 3 additions, 4 deletionsdrivers/net/usb/asix.c
- drivers/net/veth.c 2 additions, 0 deletionsdrivers/net/veth.c
- drivers/net/wan/hdlc_fr.c 3 additions, 2 deletionsdrivers/net/wan/hdlc_fr.c
- drivers/net/wireless/airo.c 1 addition, 0 deletionsdrivers/net/wireless/airo.c
- drivers/net/wireless/b43/Kconfig 1 addition, 1 deletiondrivers/net/wireless/b43/Kconfig
- drivers/net/wireless/b43/bus.c 2 additions, 0 deletionsdrivers/net/wireless/b43/bus.c
- drivers/net/wireless/b43/main.c 3 additions, 2 deletionsdrivers/net/wireless/b43/main.c
Loading
Please register or sign in to comment