diff options
| author | Bjørn Mork <[email protected]> | 2014-05-30 09:31:03 +0200 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-06-02 16:01:30 -0700 |
| commit | 1e2c611723420789e6098534fc0c57f12ee041b7 (patch) | |
| tree | fd8e55976feb4830c5856df3386460ccafa8a0a3 | |
| parent | e289fd28176b78de7e54bf6c8e2b558afefaf6df (diff) | |
net: cdc_ncm: reduce skb truesize in rx path
Cloning the big skbs we use for USB buffering chokes up TCP and
SCTP because the socket memory limits are hitting earlier than
they should. It is better to unconditionally copy the unwrapped
packets to freshly allocated skbs.
Reported-by: Jim Baxter <[email protected]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: Bjørn Mork <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | drivers/net/usb/cdc_ncm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 93c9ca9924eb..2bbbd65591c7 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1289,12 +1289,11 @@ next_ndp: break; } else { - skb = skb_clone(skb_in, GFP_ATOMIC); + /* create a fresh copy to reduce truesize */ + skb = netdev_alloc_skb_ip_align(dev->net, len); if (!skb) goto error; - skb->len = len; - skb->data = ((u8 *)skb_in->data) + offset; - skb_set_tail_pointer(skb, len); + memcpy(skb_put(skb, len), skb_in->data + offset, len); usbnet_skb_return(dev, skb); payload += len; /* count payload bytes in this NTB */ } |