Skip to contentSkip to conversation

netfilter: kill redundant check code in which setting ip_summed value

PATCH Applied Shan Wei 2 participants 2 messages Jun 10, 2010 – Jun 14, 2010

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Shan Wei

author
#0 lore raw

PATCH 1/1 netfilter: kill redundant check code in which setting ip_summed value

If the returned csum value is 0, We has set ip_summed with CHECKSUM_UNNECESSARY flag in __skb_checksum_complete_head(),

So this patch kills the check and changes to return to upper caller directly.

Signed-off-by Shan Wei<[email protected]>
---
 net/ipv4/netfilter.c |    4 +---
 net/ipv6/netfilter.c |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
net/ipv4/netfilter.c +1 -3
index 07de855..acd1ea8 100644
@@ -212,9 +212,7 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,
 		skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr, protocol,
 					       skb->len - dataoff, 0);
 		skb->ip_summed = CHECKSUM_NONE;
-		csum = __skb_checksum_complete_head(skb, dataoff + len);
-		if (!csum)
-			skb->ip_summed = CHECKSUM_UNNECESSARY;
+		return __skb_checksum_complete_head(skb, dataoff + len);
 	}
 	return csum;
 }
net/ipv6/netfilter.c +1 -3
index a74951c..7155b24 100644
@@ -151,9 +151,7 @@ static __sum16 nf_ip6_checksum_partial(struct sk_buff *skb, unsigned int hook,
 							 protocol,
 							 csum_sub(0, hsum)));
 		skb->ip_summed = CHECKSUM_NONE;
-		csum = __skb_checksum_complete_head(skb, dataoff + len);
-		if (!csum)
-			skb->ip_summed = CHECKSUM_UNNECESSARY;
+		return __skb_checksum_complete_head(skb, dataoff + len);
 	}
 	return csum;
 };
Signature · 1 line
1.6.3.3
Applied
#1 lore raw
Quoted 6 lines · Shan Wei

If the returned csum value is 0, We has set ip_summed with CHECKSUM_UNNECESSARY flag in __skb_checksum_complete_head(),

So this patch kills the check and changes to return to upper caller directly.

Applied, thanks.