From patchwork Wed Oct 14 10:40:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 530105 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43B91140F99 for ; Wed, 14 Oct 2015 21:33:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752364AbbJNKd2 (ORCPT ); Wed, 14 Oct 2015 06:33:28 -0400 Received: from mail.us.es ([193.147.175.20]:60312 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbbJNKd0 (ORCPT ); Wed, 14 Oct 2015 06:33:26 -0400 Received: (qmail 7586 invoked from network); 14 Oct 2015 12:33:24 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 14 Oct 2015 12:33:24 +0200 Received: (qmail 982 invoked by uid 507); 14 Oct 2015 10:33:24 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.7/20964. spamassassin: 3.4.0. Clear:RC:1(127.0.0.1):SA:0(-103.2/7.5):. Processed in 1.708396 secs); 14 Oct 2015 10:33:24 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-103.2 required=7.5 tests=BAYES_50, HEADER_FROM_DIFFERENT_DOMAINS, SMTPAUTH_US, SPF_HELO_FAIL, USER_IN_WHITELIST autolearn=disabled version=3.4.0 X-Spam-ASN: AS12715 87.216.0.0/16 X-Envelope-From: pneira@us.es Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 14 Oct 2015 10:33:23 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/412/antivirus2); Wed, 14 Oct 2015 12:33:23 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus2) Received: (qmail 12643 invoked from network); 14 Oct 2015 12:33:22 +0200 Received: from 129.166.216.87.static.jazztel.es (HELO us.es) (1984lsi@87.216.166.129) by mail.us.es with AES128-SHA encrypted SMTP; 14 Oct 2015 12:33:22 +0200 Date: Wed, 14 Oct 2015 12:40:28 +0200 From: Pablo Neira Ayuso To: Ian Morris Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH nf-next 0/7] coding style improvements for netfilter Message-ID: <20151014104028.GA13671@salvia> References: <1444581140-6255-1-git-send-email-ipm@chirality.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1444581140-6255-1-git-send-email-ipm@chirality.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Sun, Oct 11, 2015 at 05:32:13PM +0100, Ian Morris wrote: > This series of patches improves the coding style of the netfilter-ipv6 > code by addressing some issues detected by checkpatch. > > The changes were previously submitted as part of a larger monolithic > patch but on advice from Pablo, these are being re-sent in smaller, > more structured batches. Applied with minor changes. Thanks. I have updated this to: + ip6info->invflags & IP6T_INV_VIA_IN ? " (INV)" : ^ ^ checkpatch was complaining, and given that we were already updating this line... @@ -151,7 +151,7 @@ ip6_packet_match(const struct sk_buff *skb, ip6info->proto); if (ip6info->proto == protohdr) { - if(ip6info->invflags & IP6T_INV_PROTO) { + if (ip6info->invflags & IP6T_INV_PROTO) { return false; } return true; Removed the unnecessary brackets for single statement in the if branch above. It just added one extra line removal to the patch. --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -117,7 +117,7 @@ ip6_packet_match(const struct sk_buff *skb, if (FWINV(ret != 0, IP6T_INV_VIA_IN)) { dprintf("VIA in mismatch (%s vs %s).%s\n", indev, ip6info->iniface, - ip6info->invflags&IP6T_INV_VIA_IN ?" (INV)":""); + ip6info->invflags&IP6T_INV_VIA_IN ? " (INV)" : ""); return false; }