From ddd07d780810d66c9d9bf44a35b5ebf0167a3e68 Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Sun, 29 May 2011 23:42:29 +0300 Subject: [PATCH] --- yaml --- r: 253389 b: refs/heads/master c: d9be76f38526dccf84062e3ac3ed3a6a97698565 h: refs/heads/master i: 253387: 970c3ca133d4c5164819c0d64458540fa69aaf9e v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/nf_nat_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 009bc234e1ac..e5c8327a5cbc 100644 --- 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 index 99cfa28b6d38..ebc5f8894f99 100644 --- 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) +