Merge branch 'dev_kfree_skb'
authorDavid S. Miller <davem@davemloft.net>
Mon, 4 May 2015 04:06:56 +0000 (00:06 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 May 2015 04:06:56 +0000 (00:06 -0400)
commitbd4d95a5c9b2973d51934b830e1aa4ebf84645e6
tree0d807cb26c2cabb40712867644d52d0e16a2a646
parent4212b5433187d01b5ae83664b06e990a9116250f
parente7fcd5439ffd76e499b7ba4a2f8e99645addff3e
Merge branch 'dev_kfree_skb'

Alexander Duyck says:

====================
Clean-up some bits related to netpoll

This patch set cleans up some minor items related to netpoll.  The first
patch addresses an Rx clean-up bug that is triggered due to an assumption
that napi->poll wouldn't be called with a budget of 0.  The other two
patches address dev_kfree_skb being called in the xmit path which isn't
valid since netpoll will call ndo_start_xmit with IRQs disabled.
====================

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