diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-29 17:14:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-29 17:14:19 -0400 |
| commit | 4c96f5b19c770a72fc7b51945ef4a48c48600aaf (patch) | |
| tree | df45dde4f5da426b73e850b196ecf7ad724e5d19 /drivers/net/ethernet/ibm | |
| parent | f9d4286b9516b02e795214412d36885f572b57ad (diff) | |
| parent | 599b076d15ee3ead7af20fc907079df00b2d59a0 (diff) | |
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2016-10-27
This series contains fixes to ixgbe and i40e.
Emil fixes a NULL pointer dereference when a macvlan interface is brought
up while the PF is still down.
David root caused the original panic that was fixed by commit id
(a036244c068612 "i40e: Fix kernel panic on enable/disable LLDP") and the
fix was not quite correct, so removed the get_default_tc() and replaced
it with a #define since there is only one TC supported as a default.
Guilherme Piccoli fixes an issue where if we modprobe the driver module
without enough MSI-X interrupts, then unload the module and reload it
again, the kernel would crash. So if we fail to allocate enough MSI-X
interrupts, we should disable them since they were previously enabled.
Huaibin Wang found that the order of the arguments for
ndo_dflt_bridge_getlink() were in the correct order, so fix the order.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
0 files changed, 0 insertions, 0 deletions