diff mbox

[nf-next,0/7] coding style improvements for netfilter

Message ID 20151014104028.GA13671@salvia
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Pablo Neira Ayuso Oct. 14, 2015, 10:40 a.m. UTC 
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 netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- 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;
        }