[3.13.y-ckt stable] Patch "[3.13-stable only] Revert "gianfar: Carefully free skbs in functions called by netpoll."" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

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

to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11-ckt21.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 3a67cf7e258980a1a693af1195e0a25c751c73be Mon Sep 17 00:00:00 2001
From: Kamal Mostafa <kamal at canonical.com>
Date: Tue, 26 May 2015 09:03:38 -0700
Subject: [3.13-stable only] Revert "gianfar: Carefully free skbs in functions
 called by netpoll."

This reverts commit 06b1d865b5dab1c9183318ddbe4075dc50131e82.

This commit is not suitable for 3.13-stable; dev_consume_skb_any() does
not exist.

Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/net/ethernet/freescale/gianfar.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index fd66535..b14d790 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -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);
 		if (!skb_new) {
 			dev->stats.tx_errors++;
-			dev_kfree_skb_any(skb);
+			kfree_skb(skb);
 			return NETDEV_TX_OK;
 		}

 		if (skb->sk)
 			skb_set_owner_w(skb_new, skb->sk);
-		dev_consume_skb_any(skb);
+		consume_skb(skb);
 		skb = skb_new;
 	}

--
1.9.1