aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-11-15 15:18:02 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-15 15:18:02 -0500
commitefad0c14b720ec3791c95e0658c3990fbc124366 (patch)
tree00f3fc8854031882d016033a45c3bf34aedbf525 /net/core/dev.c
parentip6tnl: fix sparse warnings in ip6_tnl_netlink_parms() (diff)
parentixgbevf: Add checksum statistics counters to rings (diff)
downloadlinux-dev-efad0c14b720ec3791c95e0658c3990fbc124366.tar.xz
linux-dev-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 'net/core/dev.c')
0 files changed, 0 insertions, 0 deletions