Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net

Browse source

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-10-16

This series contains updates to fm10k and ixgbe.

Matthew provides two fixes for fm10k, first sets the flag to fetch the
host state before kicking off the service task that reads the host
state when bringing the interface up.  The second makes sure that we
release the mailbox lock after detecting an error and before we return
the error code.

Andy Zhou provides a compile fix for fm10k, when the driver is compiled
into the kernel and the VXLAN driver is compiled as a module.

Emil provides a fix for ixgbe to prevent against a panic by trying
to dereference a NULL pointer in ixgbe_ndo_set_vf_spoofchk().
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-10-16 14:42:51 -04:00

parent f5b720b859 600a507ddc

commit 3331177cbd

7 changed files with 32 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/net/ethernet/intel/Kconfig

View file

13

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

View file

1

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

View file

3

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c

View file

14

drivers/net/vxlan.c

View file

2

net/openvswitch/vport-geneve.c

View file

4

net/openvswitch/vport.c

View file