---

yaml --- r: 243247 b: refs/heads/master c: 3e49e6d h: refs/heads/master i: 243245: 17447ae 243243: d8f134c 243239: 26849f2 243231: 37f9550 v: v3
git-mirror · Mar 28, 2011 · bbf7109 · bbf7109
1 parent c23dff4
commit bbf7109
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4e5bd4f5784c0608078805f29d4a4897ee482f7
+refs/heads/master: 3e49e6d520401e1d25ec8d366520aad2c01adc1c
diff --git a/trunk/drivers/net/ksz884x.c b/trunk/drivers/net/ksz884x.c
@@ -4898,7 +4898,7 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)
 				goto unlock;
 			}
 			skb_copy_and_csum_dev(org_skb, skb->data);
-			org_skb->ip_summed = 0;
+			org_skb->ip_summed = CHECKSUM_NONE;
 			skb->len = org_skb->len;
 			copy_old_skb(org_skb, skb);
 		}

diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
@@ -663,7 +663,7 @@ static int pim6_rcv(struct sk_buff *skb)
 	skb_pull(skb, (u8 *)encap - skb->data);
 	skb_reset_network_header(skb);
 	skb->protocol = htons(ETH_P_IPV6);
-	skb->ip_summed = 0;
+	skb->ip_summed = CHECKSUM_NONE;
 	skb->pkt_type = PACKET_HOST;
 
 	skb_tunnel_rx(skb, reg_dev);