aboutsummaryrefslogtreecommitdiffstats
path: root/net/mpls
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-05-09 22:23:59 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-09 22:23:59 -0400
commit7c0004d3960a3ebffc68c372dfd98c09d1c680eb (patch)
treec21b9eb7afc150b2a4a893d21cbd6870f147e1f5 /net/mpls
parentusbnet: avoid integer overflow in start_xmit (diff)
parentigb: Fix NULL assignment to incorrect variable in igb_reset_q_vector (diff)
downloadlinux-dev-7c0004d3960a3ebffc68c372dfd98c09d1c680eb.tar.xz
linux-dev-7c0004d3960a3ebffc68c372dfd98c09d1c680eb.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2015-05-07 This series contains updates to igb only. Toshiaki provides two fixes for igb, first fixes an issue when changing the number of rings by ethtool which causes oops because of uninitialized pointers. The second fix resolves a typo where tx_ring was used instead of the desired rx_ring. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
0 files changed, 0 insertions, 0 deletions