Commit 3a67cf7e authored by Kamal Mostafa's avatar Kamal Mostafa

[3.13-stable only] Revert "gianfar: Carefully free skbs in functions called by netpoll."

This reverts commit 06b1d865.

This commit is not suitable for 3.13-stable; dev_consume_skb_any() does
not exist.
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 1c131733
...@@ -2139,13 +2139,13 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -2139,13 +2139,13 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
skb_new = skb_realloc_headroom(skb, fcb_len); skb_new = skb_realloc_headroom(skb, fcb_len);
if (!skb_new) { if (!skb_new) {
dev->stats.tx_errors++; dev->stats.tx_errors++;
dev_kfree_skb_any(skb); kfree_skb(skb);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
if (skb->sk) if (skb->sk)
skb_set_owner_w(skb_new, skb->sk); skb_set_owner_w(skb_new, skb->sk);
dev_consume_skb_any(skb); consume_skb(skb);
skb = skb_new; skb = skb_new;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment