From bbf7109cb7f5a241dea13b8ebcec1bca043a07f5 Mon Sep 17 00:00:00 2001
From: Cesar Eduardo Barros <cesarb@cesarb.net>
Date: Sat, 26 Mar 2011 05:10:30 +0000
Subject: [PATCH] --- yaml --- r: 243247 b: refs/heads/master c:
 3e49e6d520401e1d25ec8d366520aad2c01adc1c h: refs/heads/master i:   243245:
 17447ae153e23882a35d840afc1a0e9412f1586e   243243:
 d8f134cab5f5abfb7752334a78e671e9b7ebcd68   243239:
 26849f259798052b8784d3304bf04458dbcdf894   243231:
 37f9550e1aa8285951d43f91b31a9762043fd00c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ksz884x.c | 2 +-
 trunk/net/ipv6/ip6mr.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1c435916bde7..3af1580c179e 100644
--- 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
index 540a8dcbcc46..7f7d5708a658 100644
--- 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
index 7ff0343e05c7..29e48593bf22 100644
--- 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);