| Message ID | 20220926102158.78658-1-shaozhengchao@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8fff09effb0720d13a52eb227bf0f23c4e4b9989 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: sched: act_bpf: simplify code logic in tcf_bpf_init() | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Mon, 26 Sep 2022 18:21:58 +0800 you wrote: > Both is_bpf and is_ebpf are boolean types, so > (!is_bpf && !is_ebpf) || (is_bpf && is_ebpf) can be reduced to > is_bpf == is_ebpf in tcf_bpf_init(). > > Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> > --- > net/sched/act_bpf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [net-next] net: sched: act_bpf: simplify code logic in tcf_bpf_init() https://git.kernel.org/netdev/net-next/c/8fff09effb07 You are awesome, thank you!
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index c5dbb68e6b78..b79eee44e24e 100644 --- a/net/sched/act_bpf.c +++ b/net/sched/act_bpf.c @@ -333,7 +333,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla, is_bpf = tb[TCA_ACT_BPF_OPS_LEN] && tb[TCA_ACT_BPF_OPS]; is_ebpf = tb[TCA_ACT_BPF_FD]; - if ((!is_bpf && !is_ebpf) || (is_bpf && is_ebpf)) { + if (is_bpf == is_ebpf) { ret = -EINVAL; goto put_chain; }
Both is_bpf and is_ebpf are boolean types, so (!is_bpf && !is_ebpf) || (is_bpf && is_ebpf) can be reduced to is_bpf == is_ebpf in tcf_bpf_init(). Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> --- net/sched/act_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)