Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits) vlan: allow nested vlan_do_receive() ipv6: fix route lookup in addrconf_prefix_rcv() bonding: eliminate bond_close race conditions qlcnic: fix beacon and LED test. qlcnic: Updated License file qlcnic: updated reset sequence qlcnic: reset loopback mode if promiscous mode setting fails. qlcnic: skip IDC ack check in fw reset path. i825xx: Fix incorrect dependency for BVME6000_NET ipv6: fix route error binding peer in func icmp6_dst_alloc ipv6: fix error propagation in ip6_ufo_append_data() stmmac: update normal descriptor structure (v2) stmmac: fix NULL pointer dereference in capabilities fixup (v2) stmmac: fix a bug while checking the HW cap reg (v2) be2net: Changing MAC Address of a VF was broken. be2net: Refactored be_cmds.c file. bnx2x: update driver version to 1.70.30-0 bnx2x: use FW 7.0.29.0 bnx2x: Enable changing speed when port type is PORT_DA bnx2x: Fix 54618se LED behavior ...
Showing
- Documentation/networking/LICENSE.qlcnic 6 additions, 45 deletionsDocumentation/networking/LICENSE.qlcnic
- drivers/net/bonding/bond_3ad.c 2 additions, 6 deletionsdrivers/net/bonding/bond_3ad.c
- drivers/net/bonding/bond_alb.c 7 additions, 9 deletionsdrivers/net/bonding/bond_alb.c
- drivers/net/bonding/bond_main.c 52 additions, 44 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/bonding/bonding.h 0 additions, 1 deletiondrivers/net/bonding/bonding.h
- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h 2 additions, 2 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x.h
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c 1 addition, 0 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h 1 addition, 1 deletiondrivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c 166 additions, 51 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h 3 additions, 0 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
- drivers/net/ethernet/emulex/benet/be_cmds.c 118 additions, 282 deletionsdrivers/net/ethernet/emulex/benet/be_cmds.c
- drivers/net/ethernet/emulex/benet/be_main.c 15 additions, 13 deletionsdrivers/net/ethernet/emulex/benet/be_main.c
- drivers/net/ethernet/i825xx/Kconfig 1 addition, 1 deletiondrivers/net/ethernet/i825xx/Kconfig
- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h 2 additions, 2 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic.h
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c 31 additions, 14 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h 2 additions, 0 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c 1 addition, 1 deletiondrivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c 48 additions, 2 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c 32 additions, 16 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
- drivers/net/ethernet/stmicro/stmmac/common.h 4 additions, 4 deletionsdrivers/net/ethernet/stmicro/stmmac/common.h
Please register or sign in to comment