aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-04-08 08:54:35 -0400
committerPatrick McHardy <kaber@trash.net>2010-04-08 08:54:35 -0400
commite9f13cab49f7f28b65a6f63201fca56480b2e059 (patch)
tree050e7b2e8beb53dff692215fac429d0df682fd7b /net/netfilter
parent5dd59cc99131fb4a2775c00928b0f24b9e192a76 (diff)
netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in nfnetlink_queue
As we will set ip_summed to CHECKSUM_NONE when necessary in nfqnl_mangle, there is no need to zap CHECKSUM_COMPLETE in nfqnl_build_packet_message. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nfnetlink_queue.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 7ba4abc405c9..08c1a33077a0 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -245,8 +245,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
245 break; 245 break;
246 246
247 case NFQNL_COPY_PACKET: 247 case NFQNL_COPY_PACKET:
248 if ((entskb->ip_summed == CHECKSUM_PARTIAL || 248 if (entskb->ip_summed == CHECKSUM_PARTIAL &&
249 entskb->ip_summed == CHECKSUM_COMPLETE) &&
250 skb_checksum_help(entskb)) { 249 skb_checksum_help(entskb)) {
251 spin_unlock_bh(&queue->lock); 250 spin_unlock_bh(&queue->lock);
252 return NULL; 251 return NULL;