Message ID | 20220525023215.422470-1-liu.yun@linux.dev |
---|---|
State | Accepted |
Delegated to: | Pablo Neira |
Headers | show |
Series | netfilter: conntrack: use fallthrough to cleanup | expand |
On Wed, May 25, 2022 at 10:32:15AM +0800, Jackie Liu wrote: > From: Jackie Liu <liuyun01@kylinos.cn> > > These cases all use the same function. we can simplify the code through > fallthrough. > > $ size net/netfilter/nf_conntrack_core.o > > text data bss dec hex filename > before 81601 81430 768 163799 27fd7 net/netfilter/nf_conntrack_core.o > after 80361 81430 768 162559 27aff net/netfilter/nf_conntrack_core.o > > Arch: aarch64 > Gcc : gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1) Applied, thanks
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 0164e5f522e8..5ae64f4971d3 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -329,20 +329,18 @@ nf_ct_get_tuple(const struct sk_buff *skb, return gre_pkt_to_tuple(skb, dataoff, net, tuple); #endif case IPPROTO_TCP: - case IPPROTO_UDP: /* fallthrough */ - return nf_ct_get_tuple_ports(skb, dataoff, tuple); + case IPPROTO_UDP: #ifdef CONFIG_NF_CT_PROTO_UDPLITE case IPPROTO_UDPLITE: - return nf_ct_get_tuple_ports(skb, dataoff, tuple); #endif #ifdef CONFIG_NF_CT_PROTO_SCTP case IPPROTO_SCTP: - return nf_ct_get_tuple_ports(skb, dataoff, tuple); #endif #ifdef CONFIG_NF_CT_PROTO_DCCP case IPPROTO_DCCP: - return nf_ct_get_tuple_ports(skb, dataoff, tuple); #endif + /* fallthrough */ + return nf_ct_get_tuple_ports(skb, dataoff, tuple); default: break; }