diff options
| author |   Doug Berger <opendmb@gmail.com> | 2019-12-17 16:51:14 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-19 18:11:10 -0800 |
| commit | e3fa85883d1566d788960c0f31866a26c898c070 (patch) | |
| tree | bf45409a2f02010ae0c30d77a691f7c850c309db | |
| parent | net: bcmgenet: Turn on offloads by default (diff) | |
| download | linux-dev-e3fa85883d1566d788960c0f31866a26c898c070.tar.xz linux-dev-e3fa85883d1566d788960c0f31866a26c898c070.zip | |
net: bcmgenet: Be drop monitor friendly while re-allocating headroom
During bcmgenet_put_tx_csum() make sure we differentiate a SKB
headroom re-allocation failure from the normal swap and replace
path.
Signed-off-by: Doug Berger <opendmb@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 13e9154db253..e2bca19bf10b 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1499,11 +1499,12 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev, * enough headroom for us to insert 64B status block. */ new_skb = skb_realloc_headroom(skb, sizeof(*status)); - dev_kfree_skb(skb); if (!new_skb) { + dev_kfree_skb_any(skb); dev->stats.tx_dropped++; return NULL; } + dev_consume_skb_any(skb); skb = new_skb; } |