Patch "r8169: Call dev_kfree_skby_any instead of dev_kfree_skb." has been added to the 3.14-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    r8169: Call dev_kfree_skby_any instead of dev_kfree_skb.

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     r8169-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From foo@baz Tue Apr 21 23:05:41 CEST 2015
From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Date: Tue, 11 Mar 2014 14:16:14 -0700
Subject: r8169: Call dev_kfree_skby_any instead of dev_kfree_skb.

From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>

Replace dev_kfree_skb with dev_kfree_skb_any in functions that can
be called in hard irq and other contexts.

Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 drivers/net/ethernet/realtek/r8169.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5834,7 +5834,7 @@ static void rtl8169_tx_clear_range(struc
 					     tp->TxDescArray + entry);
 			if (skb) {
 				tp->dev->stats.tx_dropped++;
-				dev_kfree_skb(skb);
+				dev_kfree_skb_any(skb);
 				tx_skb->skb = NULL;
 			}
 		}
@@ -6059,7 +6059,7 @@ static netdev_tx_t rtl8169_start_xmit(st
 err_dma_1:
 	rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
 err_dma_0:
-	dev_kfree_skb(skb);
+	dev_kfree_skb_any(skb);
 err_update_stats:
 	dev->stats.tx_dropped++;
 	return NETDEV_TX_OK;
@@ -6142,7 +6142,7 @@ static void rtl_tx(struct net_device *de
 			tp->tx_stats.packets++;
 			tp->tx_stats.bytes += tx_skb->skb->len;
 			u64_stats_update_end(&tp->tx_stats.syncp);
-			dev_kfree_skb(tx_skb->skb);
+			dev_kfree_skb_any(tx_skb->skb);
 			tx_skb->skb = NULL;
 		}
 		dirty_tx++;


Patches currently in stable-queue which might be from ebiederm@xxxxxxxxxxxx are

queue-3.14/tg3-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
queue-3.14/bnx2-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
queue-3.14/mlx4-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
queue-3.14/r8169-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
queue-3.14/8139cp-call-dev_kfree_skby_any-instead-of-kfree_skb.patch
queue-3.14/8139too-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
queue-3.14/benet-call-dev_kfree_skby_any-instead-of-kfree_skb.patch
queue-3.14/bonding-call-dev_kfree_skby_any-instead-of-kfree_skb.patch
queue-3.14/gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch
queue-3.14/ixgb-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]