From: Ben Hutchings Date: Fri, 12 Jul 2013 04:05:31 +0000 (+0100) Subject: r8169: fix offloaded tx checksum for small packets. X-Git-Tag: v3.2.49~81 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=5f97f7c725181dfa6d58449b82276e362f3b9b15 r8169: fix offloaded tx checksum for small packets. The workaround introduced by commit e5195c1f31f3 'r8169: fix 8168evl frame padding.' upstream was incorrect and was entirely replaced in commit b423e9ae49d7 'r8169: fix offloaded tx checksum for small packets.' On the 3.2.y branch, the first commit has effectively been applied twice: the first time by itself, and the second time in commit 3cf40360f431 which squashed the two upstream commits together. That left us with both the incorrect and the correct workaround in place. Remove the incorrect one. Signed-off-by: Ben Hutchings Cc: Francois Romieu --- diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index ed7a5a65d1f9..a3bd0baea51e 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5584,14 +5584,6 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, goto err_stop_0; } - /* 8168evl does not automatically pad to minimum length. */ - if (unlikely(tp->mac_version == RTL_GIGA_MAC_VER_34 && - skb->len < ETH_ZLEN)) { - if (skb_padto(skb, ETH_ZLEN)) - goto err_update_stats; - skb_put(skb, ETH_ZLEN - skb->len); - } - if (unlikely(le32_to_cpu(txd->opts1) & DescOwn)) goto err_stop_0;