netfilter: Use fallthrough pseudo-keyword
Subsystems (4)
PATCH v2 1/1 netfilter: Use fallthrough pseudo-keyword
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case.
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
Changes in v2:
- Update subject line.
- Remove unnecessary comments.
net/bridge/netfilter/ebtables.c | 2 +- net/netfilter/ipset/ip_set_core.c | 2 +- net/netfilter/nf_conntrack_h323_asn1.c | 6 +++--- net/netfilter/nf_conntrack_proto.c | 2 +- net/netfilter/nf_conntrack_proto_tcp.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 2 +- net/netfilter/nf_nat_core.c | 12 ++++++------ net/netfilter/nf_synproxy_core.c | 6 ++---- net/netfilter/nf_tables_api.c | 8 ++++---- net/netfilter/nf_tables_core.c | 2 +- net/netfilter/nfnetlink_cttimeout.c | 2 +- net/netfilter/nft_cmp.c | 4 ++-- net/netfilter/nft_ct.c | 6 +++--- net/netfilter/nft_fib.c | 2 +- net/netfilter/nft_payload.c | 2 +- net/netfilter/utils.c | 8 ++++---- net/netfilter/x_tables.c | 2 +- 17 files changed, 34 insertions(+), 36 deletions(-)
net/bridge/netfilter/ebtables.c +1 -1
@@ -1935,7 +1935,7 @@ static int compat_mtw_from_user(const struct compat_ebt_entry_mwt *mwt, size_kern = match_size;module_put (match->me);break ; -case EBT_COMPAT_WATCHER :/* fallthrough */ +case EBT_COMPAT_WATCHER :case EBT_COMPAT_TARGET : wt =xt_request_find_target (NFPROTO_BRIDGE , name, mwt->u.revision);
net/netfilter/ipset/ip_set_core.c +1 -1
@@ -1644,7 +1644,7 @@ ip_set_dump_do(struct sk_buff *skb, struct netlink_callback *cb) goto next_set;if (set->variant->uref) set->variant->uref (set, cb, true); -/* fall through */ + fallthrough;default : ret = set->variant->list (set, skb, cb);if (!cb->args[IPSET_CB_ARG0 ])
net/netfilter/nf_conntrack_h323_asn1.c +3 -3
@@ -257,15 +257,15 @@ static unsigned int get_uint(struct bitstr *bs, int b)case 4 : v |= *bs->cur++; v <<=8 ; -/* fall through */ + fallthrough;case 3 : v |= *bs->cur++; v <<=8 ; -/* fall through */ + fallthrough;case 2 : v |= *bs->cur++; v <<=8 ; -/* fall through */ + fallthrough;case 1 : v |= *bs->cur++;break ;
net/netfilter/nf_conntrack_proto.c +1 -1
@@ -610,7 +610,7 @@ void nf_ct_netns_put(struct net *net, uint8_t nfproto)switch (nfproto) {case NFPROTO_BRIDGE :nf_ct_netns_do_put (net,NFPROTO_BRIDGE ); -/* fall through */ + fallthrough;case NFPROTO_INET :nf_ct_netns_do_put (net,NFPROTO_IPV4 );nf_ct_netns_do_put (net,NFPROTO_IPV6 );
net/netfilter/nf_conntrack_proto_tcp.c +1 -1
@@ -900,7 +900,7 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,return -NF_REPEAT ;return NF_DROP ; } -/* Fall through */ + fallthrough;case TCP_CONNTRACK_IGNORE :/* Ignored packets: *
net/netfilter/nf_conntrack_standalone.c +1 -1
@@ -60,7 +60,7 @@ print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,ntohs (tuple->src.u.tcp.port), ntohs(tuple->dst.u.tcp.port));break ; -case IPPROTO_UDPLITE :/* fallthrough */ +case IPPROTO_UDPLITE :case IPPROTO_UDP : seq_printf(s, "sport=%hu dport=%hu ", ntohs(tuple->src.u.udp.port),
net/netfilter/nf_nat_core.c +6 -6
@@ -408,7 +408,7 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,static const unsigned int max_attempts =128 ;switch (tuple->dst.protonum) { -case IPPROTO_ICMP :/* fallthrough */ +case IPPROTO_ICMP :case IPPROTO_ICMPV6 :/* id is same for either direction... */ keyptr = &tuple->src.u.icmp.id;
@@ -442,11 +442,11 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple, } goto find_free_id;#endif -case IPPROTO_UDP :/* fallthrough */ -case IPPROTO_UDPLITE :/* fallthrough */ -case IPPROTO_TCP :/* fallthrough */ -case IPPROTO_SCTP :/* fallthrough */ -case IPPROTO_DCCP :/* fallthrough */ +case IPPROTO_UDP : +case IPPROTO_UDPLITE : +case IPPROTO_TCP : +case IPPROTO_SCTP : +case IPPROTO_DCCP :if (maniptype ==NF_NAT_MANIP_SRC ) keyptr = &tuple->src.u.all;else
net/netfilter/nf_synproxy_core.c +2 -4
@@ -704,8 +704,7 @@ ipv4_synproxy_hook(void *priv, struct sk_buff *skb,nf_ct_seqadj_init (ct, ctinfo,0 ); synproxy->tsoff =0 ;this_cpu_inc (snet->stats->conn_reopened); - -/* fall through */ + fallthrough;case TCP_CONNTRACK_SYN_SENT :if (!synproxy_parse_options (skb, thoff, th, &opts))return NF_DROP ;
@@ -1128,8 +1127,7 @@ ipv6_synproxy_hook(void *priv, struct sk_buff *skb,nf_ct_seqadj_init (ct, ctinfo,0 ); synproxy->tsoff =0 ;this_cpu_inc (snet->stats->conn_reopened); - -/* fall through */ + fallthrough;case TCP_CONNTRACK_SYN_SENT :if (!synproxy_parse_options (skb, thoff, th, &opts))return NF_DROP ;
net/netfilter/nf_tables_api.c +4 -4
@@ -4339,7 +4339,7 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,case NFT_TRANS_ABORT :case NFT_TRANS_RELEASE : set->use--; -/* fall through */ + fallthrough;default :nf_tables_unbind_set (ctx, set, binding, phase ==NFT_TRANS_COMMIT );
@@ -6256,7 +6256,7 @@ void nf_tables_deactivate_flowtable(const struct nft_ctx *ctx,case NFT_TRANS_ABORT :case NFT_TRANS_RELEASE : flowtable->use--; -/* fall through */ + fallthrough;default :return ; }
@@ -7277,7 +7277,7 @@ static int nf_tables_validate(struct net *net)break ;case NFT_VALIDATE_NEED :nft_validate_state_update (net,NFT_VALIDATE_DO ); -/* fall through */ + fallthrough;case NFT_VALIDATE_DO :list_for_each_entry (table, &net->nft.tables, list) {if (nft_table_validate (net, table) <0 )
@@ -8346,7 +8346,7 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,default :return -EINVAL ; } -/* fall through */ + fallthrough;case NFT_CONTINUE :case NFT_BREAK :case NFT_RETURN :
net/netfilter/nf_tables_core.c +1 -1
@@ -213,7 +213,7 @@ nft_do_chain(struct nft_pktinfo *pkt, void *priv) jumpstack[stackptr].chain = chain; jumpstack[stackptr].rules = rules +1 ; stackptr++; -/* fall through */ + fallthrough;case NFT_GOTO :nft_trace_packet (&info, chain, rule,NFT_TRACETYPE_RULE );
net/netfilter/nfnetlink_cttimeout.c +1 -1
@@ -451,7 +451,7 @@ static int cttimeout_default_get(struct net *net, struct sock *ctnl,case IPPROTO_TCP : timeouts =nf_tcp_pernet (net)->timeouts;break ; -case IPPROTO_UDP :/* fallthrough */ +case IPPROTO_UDP :case IPPROTO_UDPLITE : timeouts =nf_udp_pernet (net)->timeouts;break ;
net/netfilter/nft_cmp.c +2 -2
@@ -43,7 +43,7 @@ void nft_cmp_eval(const struct nft_expr *expr,case NFT_CMP_LT :if (d ==0 ) goto mismatch; -/* fall through */ + fallthrough;case NFT_CMP_LTE :if (d >0 ) goto mismatch;
@@ -51,7 +51,7 @@ void nft_cmp_eval(const struct nft_expr *expr,case NFT_CMP_GT :if (d ==0 ) goto mismatch; -/* fall through */ + fallthrough;case NFT_CMP_GTE :if (d <0 ) goto mismatch;
net/netfilter/nft_ct.c +3 -3
@@ -129,7 +129,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr, return; }#endif -case NFT_CT_BYTES :/* fallthrough */ +case NFT_CT_BYTES :case NFT_CT_PKTS : {const struct nf_conn_acct *acct =nf_conn_acct_find (ct);u64 count =0 ;
@@ -1013,8 +1013,8 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx, help6 =nf_conntrack_helper_try_module_get (name, family, priv->l4proto);break ; -case NFPROTO_NETDEV :/* fallthrough */ -case NFPROTO_BRIDGE :/* same */ +case NFPROTO_NETDEV : +case NFPROTO_BRIDGE :case NFPROTO_INET : help4 =nf_conntrack_helper_try_module_get (name,NFPROTO_IPV4 , priv->l4proto);
net/netfilter/nft_fib.c +1 -1
@@ -32,7 +32,7 @@ int nft_fib_validate(const struct nft_ctx *ctx, const struct nft_expr *expr,unsigned int hooks;switch (priv->result) { -case NFT_FIB_RESULT_OIF :/* fallthrough */ +case NFT_FIB_RESULT_OIF :case NFT_FIB_RESULT_OIFNAME : hooks = (1 <<NF_INET_PRE_ROUTING );break ;
net/netfilter/nft_payload.c +1 -1
@@ -467,7 +467,7 @@ static int nft_payload_l4csum_offset(const struct nft_pktinfo *pkt,case IPPROTO_UDP :if (!nft_payload_udp_checksum (skb, pkt->xt.thoff))return -1 ; -/* Fall through. */ + fallthrough;case IPPROTO_UDPLITE : *l4csum_offset = offsetof(struct udphdr , check);break ;
net/netfilter/utils.c +4 -4
@@ -25,7 +25,7 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, skb->ip_summed =CHECKSUM_UNNECESSARY ;break ; } -/* fall through */ + fallthrough;case CHECKSUM_NONE :if (protocol !=IPPROTO_TCP && protocol !=IPPROTO_UDP ) skb->csum =0 ;
@@ -51,7 +51,7 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,case CHECKSUM_COMPLETE :if (len == skb->len - dataoff)return nf_ip_checksum (skb, hook, dataoff, protocol); -/* fall through */ + fallthrough;case CHECKSUM_NONE : skb->csum =csum_tcpudp_nofold (iph->saddr, iph->daddr, protocol, skb->len - dataoff,0 );
@@ -79,7 +79,7 @@ __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook, skb->ip_summed =CHECKSUM_UNNECESSARY ;break ; } -/* fall through */ + fallthrough;case CHECKSUM_NONE : skb->csum = ~csum_unfold( csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
@@ -106,7 +106,7 @@ static __sum16 nf_ip6_checksum_partial(struct sk_buff *skb, unsigned int hook,case CHECKSUM_COMPLETE :if (len == skb->len - dataoff)return nf_ip6_checksum (skb, hook, dataoff, protocol); -/* fall through */ + fallthrough;case CHECKSUM_NONE : hsum =skb_checksum (skb,0 , dataoff,0 ); skb->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,
net/netfilter/x_tables.c +1 -1
@@ -1572,7 +1572,7 @@ static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos, trav->curr = trav->curr->next;if (trav->curr != trav->head)break ; -/* fall through */ + fallthrough;default :return NULL ; }
Signature · 1 line
2.27.0
Quoted 3 lines · Gustavo A. R. Silva
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case.
Applied, thanks.