| Message ID | 20170328132648.GA6644@arushi-HP-Pavilion-Notebook |
|---|---|
| State | Changes Requested |
| Delegated to: | Pablo Neira |
| Headers | show |
On Tue, Mar 28, 2017 at 06:56:48PM +0530, Arushi Singhal wrote: > 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 <arushisinghal19971997@gmail.com> > --- > net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- grep seems to find some other instances of this problem for IPVS. I would prefer if all of them were fixed. $ grep -n "= *(.*);" net/netfilter/ipvs/* After some manual filtering I see net/netfilter/ipvs/ip_vs_ctl.c:113: nomem = (availmem < ipvs->sysctl_amemthresh); net/netfilter/ipvs/ip_vs_ctl.c:279: ahash ^= ((size_t) ipvs >> 8); net/netfilter/ipvs/ip_vs_proto_tcp.c:490: int on = (flags & 1); /* secure_tcp */ net/netfilter/ipvs/ip_vs_proto_tcp.c:498: pd->tcp_state_table = (on ? tcp_states_dos : tcp_states); net/netfilter/ipvs/ip_vs_sync.c:719: s->v4.type = (cp->af == AF_INET6 ? STYPE_F_INET6 : 0); net/netfilter/ipvs/ip_vs_sync.c:948: cp->timeout = (3*60*HZ) As mentioned elsewhere: If you would like me to pick up patches for IPVS then please post patches that only update IPVS files. I'm also happy for Pablo to pick up patches that include both IPVS and non-IPVS Netfilter updates of this nature. Pablo can offer his own guidance here. -- 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
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
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 <arushisinghal19971997@gmail.com> --- 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(-)