From: David S. Miller Date: Mon, 4 May 2015 04:06:56 +0000 (-0400) Subject: Merge branch 'dev_kfree_skb' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bd4d95a5c9b2973d51934b830e1aa4ebf84645e6;p=deliverable%2Flinux.git 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 --- bd4d95a5c9b2973d51934b830e1aa4ebf84645e6