Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ixgbe, ixgbevf, igbvf, igb and
networking core (bridge). Most notably is the addition of support
for local link multicast addresses in SR-IOV mode to the networking
core.
Also note, the ixgbe patch "ixgbe: Add support for pipeline reset" and
"ixgbe: Fix return value from macvlan filter function" is revised based
on community feedback.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- drivers/net/ethernet/intel/igb/e1000_defines.h 14 additions, 0 deletionsdrivers/net/ethernet/intel/igb/e1000_defines.h
- drivers/net/ethernet/intel/igb/e1000_mac.c 4 additions, 0 deletionsdrivers/net/ethernet/intel/igb/e1000_mac.c
- drivers/net/ethernet/intel/igb/e1000_nvm.c 70 additions, 0 deletionsdrivers/net/ethernet/intel/igb/e1000_nvm.c
- drivers/net/ethernet/intel/igb/e1000_nvm.h 16 additions, 0 deletionsdrivers/net/ethernet/intel/igb/e1000_nvm.h
- drivers/net/ethernet/intel/igb/e1000_phy.c 17 additions, 12 deletionsdrivers/net/ethernet/intel/igb/e1000_phy.c
- drivers/net/ethernet/intel/igb/igb_main.c 26 additions, 50 deletionsdrivers/net/ethernet/intel/igb/igb_main.c
- drivers/net/ethernet/intel/igb/igb_ptp.c 1 addition, 1 deletiondrivers/net/ethernet/intel/igb/igb_ptp.c
- drivers/net/ethernet/intel/igbvf/netdev.c 13 additions, 0 deletionsdrivers/net/ethernet/intel/igbvf/netdev.c
- drivers/net/ethernet/intel/ixgbe/ixgbe.h 1 addition, 0 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe.h
- drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c 85 additions, 29 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c 67 additions, 3 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_common.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 68 additions, 35 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_main.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c 4 additions, 2 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c 3 additions, 2 deletionsdrivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c 5 additions, 0 deletionsdrivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
- drivers/net/ethernet/intel/ixgbevf/vf.c 3 additions, 0 deletionsdrivers/net/ethernet/intel/ixgbevf/vf.c
- include/linux/etherdevice.h 19 additions, 0 deletionsinclude/linux/etherdevice.h
- net/bridge/br_device.c 1 addition, 1 deletionnet/bridge/br_device.c
- net/bridge/br_input.c 0 additions, 15 deletionsnet/bridge/br_input.c
- net/bridge/br_private.h 0 additions, 1 deletionnet/bridge/br_private.h
Loading
Please register or sign in to comment