diff options
| author | Huang Zijiang <huang.zijiang@zte.com.cn> | 2019-02-14 14:41:18 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-14 12:26:26 -0500 |
| commit | f3e5c07002b08f0e001015fd221187efb772afae (patch) | |
| tree | 502e1cb13e4efc5de303ed927657ba587eabda3a /drivers/net | |
| parent | 62f2589883405081f3e0a4aae69f3fe8932348a3 (diff) | |
| download | linux-f3e5c07002b08f0e001015fd221187efb772afae.tar.bz2 | |
net:ethernet:cadence: Replace dev_kfree_skb_any by dev_consume_skb_any
The skb should be freed by dev_consume_skb_any() in macb_pad_and_fcs()
when *skb is still used. The *skb is be replaced by nskb, so the
original *skb should be consumed(not drop).
Signed-off-by: Huang Zijiang <huang.zijiang@zte.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 0d6288dd609a..f2915f2fe21a 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1734,7 +1734,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) if (!nskb) return -ENOMEM; - dev_kfree_skb_any(*skb); + dev_consume_skb_any(*skb); *skb = nskb; } |