This is a note to let you know that I've just added the patch titled
tg3: 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:
tg3-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:18:14 -0700
Subject: tg3: 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/broadcom/tg3.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6593,7 +6593,7 @@ static void tg3_tx(struct tg3_napi *tnap
pkts_compl++;
bytes_compl += skb->len;
- dev_kfree_skb(skb);
+ dev_kfree_skb_any(skb);
if (unlikely(tx_bug)) {
tg3_tx_recover(tp);
@@ -6925,7 +6925,7 @@ static int tg3_rx(struct tg3_napi *tnapi
if (len > (tp->dev->mtu + ETH_HLEN) &&
skb->protocol != htons(ETH_P_8021Q) &&
skb->protocol != htons(ETH_P_8021AD)) {
- dev_kfree_skb(skb);
+ dev_kfree_skb_any(skb);
goto drop_it_no_recycle;
}
@@ -7808,7 +7808,7 @@ static int tigon3_dma_hwbug_workaround(s
PCI_DMA_TODEVICE);
/* Make sure the mapping succeeded */
if (pci_dma_mapping_error(tp->pdev, new_addr)) {
- dev_kfree_skb(new_skb);
+ dev_kfree_skb_any(new_skb);
ret = -1;
} else {
u32 save_entry = *entry;
@@ -7823,13 +7823,13 @@ static int tigon3_dma_hwbug_workaround(s
new_skb->len, base_flags,
mss, vlan)) {
tg3_tx_skb_unmap(tnapi, save_entry, -1);
- dev_kfree_skb(new_skb);
+ dev_kfree_skb_any(new_skb);
ret = -1;
}
}
}
- dev_kfree_skb(skb);
+ dev_kfree_skb_any(skb);
*pskb = new_skb;
return ret;
}
@@ -7872,7 +7872,7 @@ static int tg3_tso_bug(struct tg3 *tp, s
} while (segs);
tg3_tso_bug_end:
- dev_kfree_skb(skb);
+ dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
}
@@ -8110,7 +8110,7 @@ dma_error:
tg3_tx_skb_unmap(tnapi, tnapi->tx_prod, --i);
tnapi->tx_buffers[tnapi->tx_prod].skb = NULL;
drop:
- dev_kfree_skb(skb);
+ dev_kfree_skb_any(skb);
drop_nofree:
tp->tx_dropped++;
return NETDEV_TX_OK;
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