From dd0cb9504d6c126491ea65da15fd8093c5018ef1 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 8 Apr 2010 14:52:28 +0200 Subject: [PATCH] --- yaml --- r: 194943 b: refs/heads/master c: 9e56c21486f2a64473f36fa49475fd253422fbf6 h: refs/heads/master i: 194941: 99436dbc05777ec4b00f5a522d54ef8ce887534e 194939: a0efc0e14f1acbf96dfe09ae5411a4d3be7369cb 194935: 2d84c36ff0f2d53e579cacbf4023c27073410b05 194927: a7729db93efc4e3b356d3999714dc9f2553d68bb 194911: efcfc0bc81d6b70fa78872526d122084c18ac268 194879: c03937e42406690cb2f9a8999fc48b0ac7d8868a 194815: d885444ff3ced5e9e018af35595a9d41f0d367e9 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_queue.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c5f11671265..ed7d0883873a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d91c1a848c812e0e66e7e57f076667822cb460e +refs/heads/master: 9e56c21486f2a64473f36fa49475fd253422fbf6 diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c index 2855f1f38cbc..d781513282d4 100644 --- a/trunk/net/ipv4/netfilter/ip_queue.c +++ b/trunk/net/ipv4/netfilter/ip_queue.c @@ -160,8 +160,7 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp) break; case IPQ_COPY_PACKET: - if ((entry->skb->ip_summed == CHECKSUM_PARTIAL || - entry->skb->ip_summed == CHECKSUM_COMPLETE) && + if (entry->skb->ip_summed == CHECKSUM_PARTIAL && (*errp = skb_checksum_help(entry->skb))) { read_unlock_bh(&queue_lock); return NULL;