diff options
author | David S. Miller <davem@davemloft.net> | 2017-04-21 20:23:53 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-04-21 20:23:53 -0700 |
commit | fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5 (patch) | |
tree | b8c12edf3f510170cece6e9cf5337094af3095f2 /drivers/net/usb/smsc95xx.c | |
parent | 1f4407e2548827e3e6e7b943640a2da90c611306 (diff) | |
parent | 94836ecf1e7378b64d37624fbb81fe48fbd4c772 (diff) | |
download | op-kernel-dev-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.zip op-kernel-dev-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.tar.gz |
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/smsc95xx.c')
-rw-r--r-- | drivers/net/usb/smsc95xx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 4db2b6e..765400b 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -2002,13 +2002,13 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev, /* We do not advertise SG, so skbs should be already linearized */ BUG_ON(skb_shinfo(skb)->nr_frags); - if (skb_headroom(skb) < overhead) { - struct sk_buff *skb2 = skb_copy_expand(skb, - overhead, 0, flags); + /* Make writable and expand header space by overhead if required */ + if (skb_cow_head(skb, overhead)) { + /* Must deallocate here as returning NULL to indicate error + * means the skb won't be deallocated in the caller. + */ dev_kfree_skb_any(skb); - skb = skb2; - if (!skb) - return NULL; + return NULL; } if (csum) { |