mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
|
From 648c906a27d3713f589717f4be36583fc64f2ba1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Steve Glendinning <steve.glendinning@smsc.com>
|
||
|
|
Date: Thu, 19 Feb 2015 18:47:12 +0000
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
drivers/net/usb/smsc95xx.c | 10 ++++++++--
|
||
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/usb/smsc95xx.c
|
||
|
|
+++ b/drivers/net/usb/smsc95xx.c
|
||
|
|
@@ -79,6 +79,10 @@ static bool turbo_mode = true;
|
||
|
|
module_param(turbo_mode, bool, 0644);
|
||
|
|
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
|
||
|
|
|
||
|
|
+static bool truesize_mode = false;
|
||
|
|
+module_param(truesize_mode, bool, 0644);
|
||
|
|
+MODULE_PARM_DESC(truesize_mode, "Report larger truesize value");
|
||
|
|
+
|
||
|
|
static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
||
|
|
u32 *data)
|
||
|
|
{
|
||
|
|
@@ -1868,7 +1872,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||
|
|
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);
|
||
|
|
+ if (truesize_mode)
|
||
|
|
+ skb->truesize = size + sizeof(struct sk_buff);
|
||
|
|
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
@@ -1886,7 +1891,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||
|
|
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);
|
||
|
|
+ if (truesize_mode)
|
||
|
|
+ ax_skb->truesize = size + sizeof(struct sk_buff);
|
||
|
|
|
||
|
|
usbnet_skb_return(dev, ax_skb);
|
||
|
|
}
|