From f81d59f973f23a8cf82ac161c883109ac66076ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Tue, 14 Dec 2010 12:35:13 +0000 Subject: [PATCH] --- yaml --- r: 223631 b: refs/heads/master c: 0b7967503dc97864f283a3a06fbe23e041876138 h: refs/heads/master i: 223629: 5e0e6bf4b459a749cc2e23bae4e7dbe28fdb156d 223627: 00b665d38d4a5ba617ecb060199c0db6e17d9972 223623: a344ad6c05d98a5f59438f965fb2692ee47c7680 223615: 9ad19a9daaafe95740817284479c083db44f7999 v: v3 --- [refs] | 2 +- trunk/drivers/net/veth.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 006a1474c771..fc4dd87ada00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76d661586c8131453ba75a2e027c1f21511a893a +refs/heads/master: 0b7967503dc97864f283a3a06fbe23e041876138 diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c index 0bbc0c323135..cc83fa71c3ff 100644 --- a/trunk/drivers/net/veth.c +++ b/trunk/drivers/net/veth.c @@ -166,7 +166,9 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) if (!(rcv->flags & IFF_UP)) goto tx_drop; - if (dev->features & NETIF_F_NO_CSUM) + /* don't change ip_summed == CHECKSUM_PARTIAL, as that + will cause bad checksum on forwarded packets */ + if (skb->ip_summed == CHECKSUM_NONE) skb->ip_summed = rcv_priv->ip_summed; length = skb->len + ETH_HLEN;