diff options
| author | hayeswang | 2014-03-11 03:20:32 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-03-11 03:23:00 +0100 |
| commit | fcb308d52991cbdb6231ab0e7ec3e5d1c61b3a20 (patch) | |
| tree | e548432a25511e8abca511aaeea6b58e2bcb4ab5 /drivers/net/usb/r8152.c | |
| parent | net: eth: cpsw: Use net_device_stats from struct net_device (diff) | |
| download | kernel-qcow2-linux-fcb308d52991cbdb6231ab0e7ec3e5d1c61b3a20.tar.gz kernel-qcow2-linux-fcb308d52991cbdb6231ab0e7ec3e5d1c61b3a20.tar.xz kernel-qcow2-linux-fcb308d52991cbdb6231ab0e7ec3e5d1c61b3a20.zip | |
r8152: add skb_cow_head
Call skb_cow_head() before editing the tx packet header. The header
would be reallocated if it is shared.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/r8152.c')
| -rw-r--r-- | drivers/net/usb/r8152.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index c7ef30dee1b9..a90a7eb91f1c 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1376,6 +1376,11 @@ static int msdn_giant_send_check(struct sk_buff *skb) { const struct ipv6hdr *ipv6h; struct tcphdr *th; + int ret; + + ret = skb_cow_head(skb, 0); + if (ret) + return ret; ipv6h = ipv6_hdr(skb); th = tcp_hdr(skb); @@ -1383,7 +1388,7 @@ static int msdn_giant_send_check(struct sk_buff *skb) th->check = 0; th->check = ~tcp_v6_check(0, &ipv6h->saddr, &ipv6h->daddr, 0); - return 0; + return ret; } static int r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, @@ -1412,8 +1417,11 @@ static int r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, break; case htons(ETH_P_IPV6): + if (msdn_giant_send_check(skb)) { + ret = TX_CSUM_TSO; + goto unavailable; + } opts1 |= GTSENDV6; - msdn_giant_send_check(skb); break; default: |