Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-usb-lan78xx-accumulated-bug-fixes'
Oleksij Rempel says:
====================
net: usb: lan78xx: accumulated bug fixes
This series contains a collection of standalone bug fixes for the
Microchip LAN78xx driver, addressing packet handling, TX statistics,
invalid register accesses, and a kernel warning during disconnect.
====================
Link: https://patch.msgid.link/20260305143429.530909-1-o.rempel@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+11
-4
+8
-4
drivers/net/usb/lan78xx.c
+8
-4
drivers/net/usb/lan78xx.c
···
3119
3119
int ret;
3120
3120
u32 buf;
3121
3121
3122
+
/* LAN7850 is USB 2.0 and does not support LTM */
3123
+
if (dev->chipid == ID_REV_CHIP_ID_7850_)
3124
+
return 0;
3125
+
3122
3126
ret = lan78xx_read_reg(dev, USB_CFG1, &buf);
3123
3127
if (ret < 0)
3124
3128
goto init_ltm_failed;
···
3833
3829
*/
3834
3830
if (!(dev->net->features & NETIF_F_RXCSUM) ||
3835
3831
unlikely(rx_cmd_a & RX_CMD_A_ICSM_) ||
3832
+
unlikely(rx_cmd_a & RX_CMD_A_CSE_MASK_) ||
3836
3833
((rx_cmd_a & RX_CMD_A_FVTG_) &&
3837
3834
!(dev->net->features & NETIF_F_HW_VLAN_CTAG_RX))) {
3838
3835
skb->ip_summed = CHECKSUM_NONE;
···
3906
3901
return 0;
3907
3902
}
3908
3903
3909
-
if (unlikely(rx_cmd_a & RX_CMD_A_RED_)) {
3904
+
if (unlikely(rx_cmd_a & RX_CMD_A_RED_) &&
3905
+
(rx_cmd_a & RX_CMD_A_RX_HARD_ERRS_MASK_)) {
3910
3906
netif_dbg(dev, rx_err, dev->net,
3911
3907
"Error rx_cmd_a=0x%08x", rx_cmd_a);
3912
3908
} else {
···
4182
4176
}
4183
4177
4184
4178
tx_data += len;
4185
-
entry->length += len;
4179
+
entry->length += max_t(unsigned int, len, ETH_ZLEN);
4186
4180
entry->num_of_packet += skb_shinfo(skb)->gso_segs ?: 1;
4187
4181
4188
4182
dev_kfree_skb_any(skb);
···
4551
4545
phylink_stop(dev->phylink);
4552
4546
phylink_disconnect_phy(dev->phylink);
4553
4547
rtnl_unlock();
4554
-
4555
-
netif_napi_del(&dev->napi);
4556
4548
4557
4549
unregister_netdev(net);
4558
4550
+3
drivers/net/usb/lan78xx.h
+3
drivers/net/usb/lan78xx.h
···
74
74
#define RX_CMD_A_ICSM_ (0x00004000)
75
75
#define RX_CMD_A_LEN_MASK_ (0x00003FFF)
76
76
77
+
#define RX_CMD_A_RX_HARD_ERRS_MASK_ \
78
+
(RX_CMD_A_RX_ERRS_MASK_ & ~RX_CMD_A_CSE_MASK_)
79
+
77
80
/* Rx Command B */
78
81
#define RX_CMD_B_CSUM_SHIFT_ (16)
79
82
#define RX_CMD_B_CSUM_MASK_ (0xFFFF0000)