diff options
author | David S. Miller <davem@davemloft.net> | 2012-11-15 15:18:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-15 15:18:02 -0500 |
commit | efad0c14b720ec3791c95e0658c3990fbc124366 (patch) | |
tree | 00f3fc8854031882d016033a45c3bf34aedbf525 /include/linux/netdevice.h | |
parent | 1ff05fb7114a6b4118e0f7d89fed2659f7131b0a (diff) | |
parent | 55fb277c1f6181d445f88ef8596b87eab61f14b6 (diff) | |
download | lwn-efad0c14b720ec3791c95e0658c3990fbc124366.tar.gz lwn-efad0c14b720ec3791c95e0658c3990fbc124366.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ioat (DCA) and ixgbevf.
...
Alexander Duyck (1):
ioat: Do not enable DCA if tag map is invalid
Greg Rose (8):
ixgbevf: Streamline the rx buffer allocation
ixgbevf: Fix unnecessary dereference where local var is available.
ixgbevf: Remove the ring adapter pointer value
ixgbevf: Remove checking for mac.ops function pointers
ixgbevf: Remove mailbox spinlock from the reset function
ixgbevf: White space and comments clean up
ixgbevf: Remove unneeded and obsolete comment
ixgbevf: Add checksum statistics counters to rings
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
0 files changed, 0 insertions, 0 deletions