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: (95 commits) b44: GFP_DMA skb should not escape from driver korina: do not use IRQF_SHARED with IRQF_DISABLED korina: do not stop queue here korina: fix handling tx_chain_tail korina: do tx at the right position korina: do schedule napi after testing for it korina: rework korina_rx() for use with napi korina: disable napi on close and restart korina: reset resource buffer size to 1536 korina: fix usage of driver_data bnx2x: First slow path interrupt race bnx2x: MTU Filter bnx2x: Indirection table initialization index bnx2x: Missing brackets bnx2x: Fixing the doorbell size bnx2x: Endianness issues bnx2x: VLAN tagged packets without VLAN offload bnx2x: Protecting the link change indication bnx2x: Flow control updated before reporting the link bnx2x: Missing mask when calculating flow control ...
Showing
- drivers/isdn/i4l/isdn_net.c 3 additions, 6 deletionsdrivers/isdn/i4l/isdn_net.c
- drivers/net/arm/etherh.c 1 addition, 1 deletiondrivers/net/arm/etherh.c
- drivers/net/ax88796.c 21 additions, 6 deletionsdrivers/net/ax88796.c
- drivers/net/b44.c 3 additions, 1 deletiondrivers/net/b44.c
- drivers/net/b44.h 1 addition, 1 deletiondrivers/net/b44.h
- drivers/net/bnx2x.h 12 additions, 7 deletionsdrivers/net/bnx2x.h
- drivers/net/bnx2x_main.c 120 additions, 58 deletionsdrivers/net/bnx2x_main.c
- drivers/net/fs_enet/fs_enet-main.c 1 addition, 0 deletionsdrivers/net/fs_enet/fs_enet-main.c
- drivers/net/gianfar.c 8 additions, 0 deletionsdrivers/net/gianfar.c
- drivers/net/ibm_newemac/mal.c 3 additions, 1 deletiondrivers/net/ibm_newemac/mal.c
- drivers/net/ibm_newemac/mal.h 2 additions, 0 deletionsdrivers/net/ibm_newemac/mal.h
- drivers/net/irda/irda-usb.c 1 addition, 1 deletiondrivers/net/irda/irda-usb.c
- drivers/net/korina.c 80 additions, 78 deletionsdrivers/net/korina.c
- drivers/net/netxen/netxen_nic.h 64 additions, 82 deletionsdrivers/net/netxen/netxen_nic.h
- drivers/net/netxen/netxen_nic_ctx.c 21 additions, 29 deletionsdrivers/net/netxen/netxen_nic_ctx.c
- drivers/net/netxen/netxen_nic_ethtool.c 23 additions, 8 deletionsdrivers/net/netxen/netxen_nic_ethtool.c
- drivers/net/netxen/netxen_nic_hw.c 63 additions, 34 deletionsdrivers/net/netxen/netxen_nic_hw.c
- drivers/net/netxen/netxen_nic_init.c 54 additions, 51 deletionsdrivers/net/netxen/netxen_nic_init.c
- drivers/net/netxen/netxen_nic_main.c 124 additions, 79 deletionsdrivers/net/netxen/netxen_nic_main.c
- drivers/net/phy/phy_device.c 0 additions, 9 deletionsdrivers/net/phy/phy_device.c
Loading
Please register or sign in to comment