summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSteve Glendinning <steve.glendinning@smsc.com>2015-02-19 18:47:12 +0000
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:12:33 +0100
commit2179cdc870537f724b33e63bac260923299b8351 (patch)
tree21f8c0e5f1ed834120166d6033a95689fdb3b07b /drivers
parent48e908ced6de576001380124c34e0105fe4790ca (diff)
downloadlinux-2179cdc870537f724b33e63bac260923299b8351.tar.gz
smsx95xx: fix crimes against truesize
smsc95xx is adjusting truesize when it shouldn't, and following a recent patch from Eric this is now triggering warnings. This patch stops smsc95xx from changing truesize. Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Diffstat (limited to 'drivers')
-rwxr-xr-x[-rw-r--r--]drivers/net/usb/smsc95xx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index e29a323a75b2..aff63dc27016 100644..100755
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1841,7 +1841,6 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(skb);
skb_trim(skb, skb->len - 4); /* remove fcs */
- skb->truesize = size + sizeof(struct sk_buff);
return 1;
}
@@ -1859,7 +1858,6 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(ax_skb);
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
- ax_skb->truesize = size + sizeof(struct sk_buff);
usbnet_skb_return(dev, ax_skb);
}