]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
benet: Call dev_kfree_skby_any instead of kfree_skb.
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 11 Mar 2014 21:19:50 +0000 (14:19 -0700)
committerJiri Slaby <jslaby@suse.cz>
Mon, 27 Apr 2015 08:55:33 +0000 (10:55 +0200)
commit d8ec2c02caa3515f35d6c33eedf529394c419298 upstream.

Replace free_skb with dev_kfree_skb_any in be_tx_compl_process as
which can be called in hard irq by netpoll, softirq context
by normal napi polling, and in normal sleepable context
by the network device close method.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/net/ethernet/emulex/benet/be_main.c

index 5226c99813c7cbfe34159f12611d40a1a9380a09..f9abb1b95f33c8bb416ae78cd76155127669f31b 100644 (file)
@@ -1777,7 +1777,7 @@ static u16 be_tx_compl_process(struct be_adapter *adapter,
                queue_tail_inc(txq);
        } while (cur_index != last_index);
 
-       kfree_skb(sent_skb);
+       dev_kfree_skb_any(sent_skb);
        return num_wrbs;
 }