From patchwork Tue Mar 28 13:26:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arushi Singhal X-Patchwork-Id: 744264 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 3vssDQ0yRGz9s03 for ; Wed, 29 Mar 2017 00:28:54 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sHV5Z88J"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932577AbdC1N1M (ORCPT ); Tue, 28 Mar 2017 09:27:12 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34524 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932497AbdC1N1I (ORCPT ); Tue, 28 Mar 2017 09:27:08 -0400 Received: by mail-pg0-f66.google.com with SMTP id o123so18616956pga.1; Tue, 28 Mar 2017 06:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=KrPG6p22457VEXMDUeBAhWh87XoebkMBo6wEdWHNItM=; b=sHV5Z88JaPhHpMlOTxrOua8zIRDZe73p8uyALBmCvkXJ20KejOtZ5VhHAq429XR1+8 xMmClXVv5dlWT2hdQwaXZGPWuye33t4ObVtDcEwVqLjuo4ulmYa6yAPMsLPr6rpINewH 55Hnwo3tjujLwl7GnIoYXYK4xi7MjazMhKfhIdVZMujeK1YnUXf6wzqqBgFSEmgGu8Ud gCfUjZNyTDYeTpywR1jh3LmEpPr/1urkfC/V5bUSSxsUlINJ5J2zBdn1VccFhFONNH7H gXj16vp21e17f052gAxElvE1c5BBuKWHgceVOprxc9iqhtPi7KsA3NrXXJcyMqq4Ri/z BVYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=KrPG6p22457VEXMDUeBAhWh87XoebkMBo6wEdWHNItM=; b=Jm8DyTgbGfxfUx6Qdx3LpfO4fpWWpp4TZADGCFkCWeB1gAh8Ogje7adtXo6UsjJX7H Bq08niSBe+xtSoIKgDGMH4EU/qlaIhmfDiZwn0IaWLh/k/8LmsFX3mi6okdyvqqnhej6 dhbwR/u44qbHX+GdMuiZXSfuE+4cke4jgWk1BZPakSzrD1JNsclD5YiMi3k7CtKWVBcp +limHR4o4s9IjhczHEv+ZAAN4z/HbtVrNfUeT3khEr1Q3EVzdw0HVwSh1w6bhHuasW9S Gy2COP3yW40QN5GtGUwsjJ6ptJ+GDQhwrnXZb0/RJn5EaLYsOo3sg9QEL8EzscUN0XMp Vu+A== X-Gm-Message-State: AFeK/H1t3urnVeZ9Smacfzuh1UDDpwadX/qQ73ddI5yohj//RFVCKLgu98h8h96VlD+hcQ== X-Received: by 10.99.140.27 with SMTP id m27mr31076853pgd.174.1490707612476; Tue, 28 Mar 2017 06:26:52 -0700 (PDT) Received: from arushi-HP-Pavilion-Notebook ([14.139.82.6]) by smtp.gmail.com with ESMTPSA id l9sm7647485pfi.97.2017.03.28.06.26.50 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Mar 2017 06:26:51 -0700 (PDT) Date: Tue, 28 Mar 2017 18:56:48 +0530 From: Arushi Singhal To: wensong@linux-vs.org Cc: Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Jozsef Kadlecsik , davem@davemloft.net, netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com Subject: [PATCH] net: netfilters: Remove unnecessary parenthesis Message-ID: <20170328132648.GA6644@arushi-HP-Pavilion-Notebook> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Rmoved parentheses on the right hand side of assignment, as they are not required. The following coccinelle script was used to fix this issue: @@ local idexpression id; expression e; @@ id = -( e -) Signed-off-by: Arushi Singhal --- net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- net/netfilter/nf_conntrack_proto_tcp.c | 2 +- net/netfilter/nft_fib.c | 2 +- net/netfilter/nft_set_bitmap.c | 2 +- net/netfilter/x_tables.c | 2 +- net/netfilter/xt_socket.c | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c index 5117bcb7d2f0..9f2abda017c4 100644 --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c @@ -487,7 +487,7 @@ static struct tcp_states_t tcp_states_dos [] = { static void tcp_timeout_change(struct ip_vs_proto_data *pd, int flags) { - int on = (flags & 1); /* secure_tcp */ + int on = flags & 1; /* secure_tcp */ /* ** FIXME: change secure_tcp to independent sysctl var diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index b122e9dacfed..2e5e4a4d4778 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -789,7 +789,7 @@ static int tcp_error(struct net *net, struct nf_conn *tmpl, } /* Check TCP flags. */ - tcpflags = (tcp_flag_byte(th) & ~(TCPHDR_ECE|TCPHDR_CWR|TCPHDR_PSH)); + tcpflags = tcp_flag_byte(th) & ~(TCPHDR_ECE|TCPHDR_CWR|TCPHDR_PSH); if (!tcp_valid_flags[tcpflags]) { if (LOG_INVALID(net, IPPROTO_TCP)) nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, diff --git a/net/netfilter/nft_fib.c b/net/netfilter/nft_fib.c index 29a4906adc27..c907c27b0374 100644 --- a/net/netfilter/nft_fib.c +++ b/net/netfilter/nft_fib.c @@ -35,7 +35,7 @@ int nft_fib_validate(const struct nft_ctx *ctx, const struct nft_expr *expr, switch (priv->result) { case NFT_FIB_RESULT_OIF: /* fallthrough */ case NFT_FIB_RESULT_OIFNAME: - hooks = (1 << NF_INET_PRE_ROUTING); + hooks = 1 << NF_INET_PRE_ROUTING; break; case NFT_FIB_RESULT_ADDRTYPE: if (priv->flags & NFTA_FIB_F_IIF) diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c index 152d226552c1..09867146539e 100644 --- a/net/netfilter/nft_set_bitmap.c +++ b/net/netfilter/nft_set_bitmap.c @@ -47,7 +47,7 @@ struct nft_bitmap { static inline void nft_bitmap_location(u32 key, u32 *idx, u32 *off) { - u32 k = (key << 1); + u32 k = key << 1; *idx = k / BITS_PER_BYTE; *off = k % BITS_PER_BYTE; diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 14857afc9937..7a4a9beadedb 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -506,7 +506,7 @@ static int xt_check_entry_match(const char *match, const char *target, return -EINVAL; length -= pos->u.match_size; - pos = ((void *)((char *)(pos) + (pos)->u.match_size)); + pos = (void *)((char *)(pos) + (pos)->u.match_size); } while (length > 0); return 0; diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 770bbec878f1..bf86e12808bd 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c @@ -65,9 +65,9 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, /* Ignore sockets listening on INADDR_ANY, * unless XT_SOCKET_NOWILDCARD is set */ - wildcard = (!(info->flags & XT_SOCKET_NOWILDCARD) && + wildcard = !(info->flags & XT_SOCKET_NOWILDCARD) && sk_fullsock(sk) && - inet_sk(sk)->inet_rcv_saddr == 0); + inet_sk(sk)->inet_rcv_saddr == 0; /* Ignore non-transparent sockets, * if XT_SOCKET_TRANSPARENT is used @@ -122,9 +122,9 @@ socket_mt6_v1_v2_v3(const struct sk_buff *skb, struct xt_action_param *par) /* Ignore sockets listening on INADDR_ANY * unless XT_SOCKET_NOWILDCARD is set */ - wildcard = (!(info->flags & XT_SOCKET_NOWILDCARD) && + wildcard = !(info->flags & XT_SOCKET_NOWILDCARD) && sk_fullsock(sk) && - ipv6_addr_any(&sk->sk_v6_rcv_saddr)); + ipv6_addr_any(&sk->sk_v6_rcv_saddr); /* Ignore non-transparent sockets, * if XT_SOCKET_TRANSPARENT is used