From patchwork Thu Apr 8 12:41:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 49730 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DF5F2B7D19 for ; Thu, 8 Apr 2010 22:42:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758420Ab0DHMmK (ORCPT ); Thu, 8 Apr 2010 08:42:10 -0400 Received: from ringil.hengli.com.au ([216.59.3.182]:52456 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758389Ab0DHMmH (ORCPT ); Thu, 8 Apr 2010 08:42:07 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1Nzr3X-0007AT-3R; Thu, 08 Apr 2010 22:41:59 +1000 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1Nzr3W-0006Eq-F9; Thu, 08 Apr 2010 20:41:58 +0800 Date: Thu, 8 Apr 2010 20:41:58 +0800 From: Herbert Xu To: Patrick McHardy , "David S. Miller" , netdev@vger.kernel.org Subject: netfilter: Only do skb_checksum_help on CHECKSUM_PARTIAL in nfnetlink_queue Message-ID: <20100408124158.GB23910@gondor.apana.org.au> References: <20100408123545.GA23829@gondor.apana.org.au> <20100408123930.GA23910@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100408123930.GA23910@gondor.apana.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cheers, diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index e70a6ef..12e1ab3 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -246,8 +246,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, break; case NFQNL_COPY_PACKET: - if ((entskb->ip_summed == CHECKSUM_PARTIAL || - entskb->ip_summed == CHECKSUM_COMPLETE) && + if (entskb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(entskb)) { spin_unlock_bh(&queue->lock); return NULL;