delete queue-3.10/gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch

diff --git a/queue-3.10/gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch b/queue-3.10/gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch
deleted file mode 100644 (file)
index 420d0bb..0000000
--- a/queue-3.10/gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From foo@baz Tue Apr 21 23:05:58 CEST 2015
-From: "Eric W. Biederman" <ebiederm@xmission.com>
-Date: Tue, 11 Mar 2014 14:20:26 -0700
-Subject: gianfar: Carefully free skbs in functions called by netpoll.
-
-From: "Eric W. Biederman" <ebiederm@xmission.com>
-
-netpoll can call functions in hard irq context that are ordinarily
-called in lesser contexts.  For those functions use dev_kfree_skb_any
-and dev_consume_skb_any so skbs are freed safely from hard irq
-context.
-
-Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/freescale/gianfar.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/freescale/gianfar.c
-+++ b/drivers/net/ethernet/freescale/gianfar.c
-@@ -2102,13 +2102,13 @@ static int gfar_start_xmit(struct sk_buf
-               skb_new = skb_realloc_headroom(skb, fcb_length);
-               if (!skb_new) {
-                       dev->stats.tx_errors++;
--                      kfree_skb(skb);
-+                      dev_kfree_skb_any(skb);
-                       return NETDEV_TX_OK;
-               }
- 
-               if (skb->sk)
-                       skb_set_owner_w(skb_new, skb->sk);
--              consume_skb(skb);
-+              dev_consume_skb_any(skb);
-               skb = skb_new;
-       }
- 

diff --git a/queue-3.10/series b/queue-3.10/series
index 68b7ef0869eff4ec55c68a8e39d0eb1cd70aee69..5435a1827d012416f904fc2543cca59682692015 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -11,4 +11,3 @@ bnx2-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
 tg3-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
 ixgb-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
 benet-call-dev_kfree_skby_any-instead-of-kfree_skb.patch
-gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch