From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 4/5] net: systemport: Be drop monitor friendly while re-allocating headroom
Date: Thu, 27 Sep 2018 15:36:13 -0700 [thread overview]
Message-ID: <20180927223614.7116-5-f.fainelli@gmail.com> (raw)
In-Reply-To: <20180927223614.7116-1-f.fainelli@gmail.com>
During bcm_sysport_insert_tsb() make sure we differentiate a SKB
headroom re-allocation failure from the normal swap and replace path.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/bcmsysport.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 977d9dec2fb0..6c40cf6090ab 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1230,12 +1230,13 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb,
/* Re-allocate SKB if needed */
if (unlikely(skb_headroom(skb) < sizeof(*tsb))) {
nskb = skb_realloc_headroom(skb, sizeof(*tsb));
- dev_kfree_skb(skb);
if (!nskb) {
+ dev_kfree_skb_any(skb);
dev->stats.tx_errors++;
dev->stats.tx_dropped++;
return NULL;
}
+ dev_consume_skb_any(skb);
skb = nskb;
}
--
2.17.1
next prev parent reply other threads:[~2018-09-28 4:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 22:36 [PATCH net-next 0/5] net: systemport: Turn on offloads by Florian Fainelli
2018-09-27 22:36 ` [PATCH net-next 1/5] net: systemport: Refactor bcm_sysport_set_features() Florian Fainelli
2018-09-27 22:36 ` [PATCH net-next 2/5] net: systemport: Utilize bcm_sysport_set_features() during resume/open Florian Fainelli
2018-09-27 22:36 ` [PATCH net-next 3/5] net: systemport: Turn on offloads by default Florian Fainelli
2018-09-27 22:36 ` Florian Fainelli [this message]
2018-09-27 22:36 ` [PATCH net-next 5/5] net: systemport: Add software counters to track reallocations Florian Fainelli
2018-10-02 6:12 ` [PATCH net-next 0/5] net: systemport: Turn on offloads by David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180927223614.7116-5-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).