diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-11-24 09:12:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-11-24 09:13:00 +0100 |
| commit | 43906287380f962a7178059cf8da1e03d94da3e0 (patch) | |
| tree | 669a295bf922e54c9a221550bb4598c3758ba9a0 /drivers/net/ethernet/freescale/gianfar.c | |
| parent | 9ac05523d38d4c2f40c9e41fc1453146fcd74368 (diff) | |
| parent | 29b105d947c661e521bf7b1005868c02441732be (diff) | |
| download | linux-43906287380f962a7178059cf8da1e03d94da3e0.tar.gz | |
Merge branch 'topic/usb-audio-refactoring' into for-next
Pull the USB audio improvement
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 41dd3d0f3452..d391a45cebb6 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1829,20 +1829,12 @@ static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) fcb_len = GMAC_FCB_LEN + GMAC_TXPAL_LEN; /* make space for additional header when fcb is needed */ - if (fcb_len && unlikely(skb_headroom(skb) < fcb_len)) { - struct sk_buff *skb_new; - - skb_new = skb_realloc_headroom(skb, fcb_len); - if (!skb_new) { + if (fcb_len) { + if (unlikely(skb_cow_head(skb, fcb_len))) { dev->stats.tx_errors++; dev_kfree_skb_any(skb); return NETDEV_TX_OK; } - - if (skb->sk) - skb_set_owner_w(skb_new, skb->sk); - dev_consume_skb_any(skb); - skb = skb_new; } /* total number of fragments in the SKB */ @@ -3380,7 +3372,7 @@ static int gfar_probe(struct platform_device *ofdev) if (dev->features & NETIF_F_IP_CSUM || priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER) - dev->needed_headroom = GMAC_FCB_LEN; + dev->needed_headroom = GMAC_FCB_LEN + GMAC_TXPAL_LEN; /* Initializing some of the rx/tx queue level parameters */ for (i = 0; i < priv->num_tx_queues; i++) { |