Skip to content

Commit 19c0f40

Browse files
hayesorzdavem330
authored andcommitted
r8152: fix the sw rx checksum is unavailable
Fix the hw rx checksum is always enabled, and the user couldn't switch it to sw rx checksum. Note that the RTL_VER_01 only support sw rx checksum only. Besides, the hw rx checksum for RTL_VER_02 is disabled after commit b9a321b ("r8152: Fix broken RX checksums."). Re-enable it. Signed-off-by: Hayes Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ba836a6 commit 19c0f40

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/net/usb/r8152.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@ static u8 r8152_rx_csum(struct r8152 *tp, struct rx_desc *rx_desc)
17301730
u8 checksum = CHECKSUM_NONE;
17311731
u32 opts2, opts3;
17321732

1733-
if (tp->version == RTL_VER_01 || tp->version == RTL_VER_02)
1733+
if (!(tp->netdev->features & NETIF_F_RXCSUM))
17341734
goto return_result;
17351735

17361736
opts2 = le32_to_cpu(rx_desc->opts2);
@@ -4356,6 +4356,11 @@ static int rtl8152_probe(struct usb_interface *intf,
43564356
NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |
43574357
NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
43584358

4359+
if (tp->version == RTL_VER_01) {
4360+
netdev->features &= ~NETIF_F_RXCSUM;
4361+
netdev->hw_features &= ~NETIF_F_RXCSUM;
4362+
}
4363+
43594364
netdev->ethtool_ops = &ops;
43604365
netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE);
43614366

0 commit comments

Comments
 (0)