| Message ID | 7fbb35f0-e244-ef65-aa55-3872d7d38698@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 847f0a2bfd2fe16d6afa537816b313b71f32e139 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net] r8169: disable hw csum for short packets on all chip versions | expand |
On Thu, 5 Nov 2020 18:14:47 +0100 Heiner Kallweit wrote: > RTL8125B has same or similar short packet hw padding bug as RTL8168evl. > The main workaround has been extended accordingly, however we have to > disable also hw checksumming for short packets on affected new chip > versions. Instead of checking for an affected chip version let's > simply disable hw checksumming for short packets in general. > > v2: > - remove the version checks and disable short packet hw csum in general > - reflect this in commit title and message > > Fixes: 0439297be951 ("r8169: add support for RTL8125B") > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Applied, thanks!
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 5 Nov 2020 18:14:47 +0100 you wrote: > RTL8125B has same or similar short packet hw padding bug as RTL8168evl. > The main workaround has been extended accordingly, however we have to > disable also hw checksumming for short packets on affected new chip > versions. Instead of checking for an affected chip version let's > simply disable hw checksumming for short packets in general. > > v2: > - remove the version checks and disable short packet hw csum in general > - reflect this in commit title and message > > [...] Here is the summary with links: - [v2,net] r8169: disable hw csum for short packets on all chip versions https://git.kernel.org/netdev/net/c/847f0a2bfd2f You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index c5d5c1cfc..aa6f8b16d 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4314,18 +4314,9 @@ static netdev_features_t rtl8169_features_check(struct sk_buff *skb, rtl_chip_supports_csum_v2(tp)) features &= ~NETIF_F_ALL_TSO; } else if (skb->ip_summed == CHECKSUM_PARTIAL) { - if (skb->len < ETH_ZLEN) { - switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_11: - case RTL_GIGA_MAC_VER_12: - case RTL_GIGA_MAC_VER_17: - case RTL_GIGA_MAC_VER_34: - features &= ~NETIF_F_CSUM_MASK; - break; - default: - break; - } - } + /* work around hw bug on some chip versions */ + if (skb->len < ETH_ZLEN) + features &= ~NETIF_F_CSUM_MASK; if (transport_offset > TCPHO_MAX && rtl_chip_supports_csum_v2(tp))
RTL8125B has same or similar short packet hw padding bug as RTL8168evl. The main workaround has been extended accordingly, however we have to disable also hw checksumming for short packets on affected new chip versions. Instead of checking for an affected chip version let's simply disable hw checksumming for short packets in general. v2: - remove the version checks and disable short packet hw csum in general - reflect this in commit title and message Fixes: 0439297be951 ("r8169: add support for RTL8125B") Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/ethernet/realtek/r8169_main.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)