---

yaml --- r: 58943 b: refs/heads/master c: a298830 h: refs/heads/master i: 58941: 0fbf94d 58939: 3d76c38 58935: 05b1cd2 58927: 59a23c9 58911: e93165e 58879: c74f6af v: v3
git-mirror · Jul 11, 2007 · 2d201ea · 2d201ea
1 parent 377b0f9
commit 2d201ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58e50a904ec78caf4ca938801c031413b0d3f962
+refs/heads/master: a298830cd026b4c0cde45ef3679a5f68a17577e6
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1509,11 +1509,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;
 	}