diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-10-16 14:42:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-16 14:42:51 -0400 |
| commit | 3331177cbde01e03e2eae7aee13ad87fffd7be42 (patch) | |
| tree | 7adb7e47650db14b864e21d7bc31e54ad6914c72 /include/net/netlink.h | |
| parent | gianfar: Add FCS to rx buffer size (fix) (diff) | |
| parent | ixgbe: check for vfs outside of sriov_num_vfs before dereference (diff) | |
| download | linux-dev-3331177cbde01e03e2eae7aee13ad87fffd7be42.tar.xz linux-dev-3331177cbde01e03e2eae7aee13ad87fffd7be42.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
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>
Diffstat (limited to 'include/net/netlink.h')
0 files changed, 0 insertions, 0 deletions