---

yaml --- r: 253389 b: refs/heads/master c: d9be76f h: refs/heads/master i: 253387: 970c3ca v: v3
git-mirror · Jun 5, 2011 · ddd07d7 · ddd07d7
1 parent 6fdbaf3
commit ddd07d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b48e3c5c323fea08c12a340cbb8dcc8ca2431d5b
+refs/heads/master: d9be76f38526dccf84062e3ac3ed3a6a97698565
diff --git a/trunk/net/ipv4/netfilter/nf_nat_helper.c b/trunk/net/ipv4/netfilter/nf_nat_helper.c
@@ -160,7 +160,7 @@ static void nf_nat_csum(struct sk_buff *skb, const struct iphdr *iph, void *data
 
 	if (skb->ip_summed != CHECKSUM_PARTIAL) {
 		if (!(rt->rt_flags & RTCF_LOCAL) &&
-		    skb->dev->features & NETIF_F_V4_CSUM) {
+		    (!skb->dev || skb->dev->features & NETIF_F_V4_CSUM)) {
 			skb->ip_summed = CHECKSUM_PARTIAL;
 			skb->csum_start = skb_headroom(skb) +
 					  skb_network_offset(skb) +