The patch titled
net: fix TX checksum feature check
has been removed from the -mm tree. Its filename was
net-fix-tx-checksum-feature-check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: net: fix TX checksum feature check
From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
This patch fixes a boolean error in the new TX checksum check that causes
bogus TSO packets to be generated.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/core/dev.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN net/core/dev.c~net-fix-tx-checksum-feature-check net/core/dev.c
--- a/net/core/dev.c~net-fix-tx-checksum-feature-check
+++ a/net/core/dev.c
@@ -1522,11 +1522,11 @@ int dev_queue_xmit(struct sk_buff *skb)
skb_set_transport_header(skb, skb->csum_start -
skb_headroom(skb));
- if (!(dev->features & NETIF_F_GEN_CSUM)
- || ((dev->features & NETIF_F_IP_CSUM)
- && skb->protocol == htons(ETH_P_IP))
- || ((dev->features & NETIF_F_IPV6_CSUM)
- && skb->protocol == htons(ETH_P_IPV6)))
+ if (!(dev->features & NETIF_F_GEN_CSUM) &&
+ !((dev->features & NETIF_F_IP_CSUM) &&
+ skb->protocol == htons(ETH_P_IP)) &&
+ !((dev->features & NETIF_F_IPV6_CSUM) &&
+ skb->protocol == htons(ETH_P_IPV6)))
if (skb_checksum_help(skb))
goto out_kfree_skb;
}
_
Patches currently in -mm which might be from herbert@xxxxxxxxxxxxxxxxxxx are
git-md-accel.patch
git-net.patch
git-cryptodev.patch
make-crypto-api-use-seq_list_xxx-helpers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
