diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-22 06:23:53 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-22 06:23:53 +0300 |
| commit | fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5 (patch) | |
| tree | b8c12edf3f510170cece6e9cf5337094af3095f2 /drivers/net/usb/smsc75xx.c | |
| parent | 1f4407e2548827e3e6e7b943640a2da90c611306 (diff) | |
| parent | 94836ecf1e7378b64d37624fbb81fe48fbd4c772 (diff) | |
| download | linux-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Both conflict were simple overlapping changes.
In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/smsc75xx.c')
| -rw-r--r-- | drivers/net/usb/smsc75xx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 1ce01dbd494f..d0a113743195 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -2204,13 +2204,9 @@ static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev, { u32 tx_cmd_a, tx_cmd_b; - if (skb_headroom(skb) < SMSC75XX_TX_OVERHEAD) { - struct sk_buff *skb2 = - skb_copy_expand(skb, SMSC75XX_TX_OVERHEAD, 0, flags); + if (skb_cow_head(skb, SMSC75XX_TX_OVERHEAD)) { dev_kfree_skb_any(skb); - skb = skb2; - if (!skb) - return NULL; + return NULL; } tx_cmd_a = (u32)(skb->len & TX_CMD_A_LEN) | TX_CMD_A_FCS; |