mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
a39dca7ead
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.138
Removed upstreamed:
generic/backport-5.15/819-v6.6-0018-nvmem-imx-correct-nregs-for-i.MX6SLL.patch[1]
generic/backport-5.15/819-v6.6-0019-nvmem-imx-correct-nregs-for-i.MX6UL.patch[2]
generic/backport-5.15/819-v6.6-0020-nvmem-imx-correct-nregs-for-i.MX6ULL.patch[3]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.138&id=6e22bf6f00d593b0a7e0b2f418fde89317424671
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.138&id=6efd498009b987a92f57f3bdae476f0503364fb7
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.138&id=6e22bf6f00d593b0a7e0b2f418fde89317424671
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
[Refreshed on top of OpenWrt 23.05]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 573c8c3d78)
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From bcfe73a54afc6871e3dc16f6ca2c626f21fd4e8d 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
|
|
@@ -67,6 +67,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, int in_pm)
|
|
{
|
|
@@ -1845,7 +1849,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;
|
|
}
|
|
@@ -1863,7 +1868,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);
|
|
}
|