| Message ID | 20240822043252.3488749-9-lizetao1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | aa32799c017b881a79cb1b9263419626fc9a5f66 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: Delete some redundant judgments | expand |
Li Zetao <lizetao1@huawei.com> writes: > The initial value of err is -ENOBUFS, and err is guaranteed to be > less than 0 before all goto errout. Therefore, on the error path > of errout, there is no need to repeatedly judge that err is less than 0, > and delete redundant judgments to make the code more concise. > > Signed-off-by: Li Zetao <lizetao1@huawei.com> Reviewed-by: Petr Machata <petrm@nvidia.com>
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index dd342e6ecf3f..e3ee93c562c3 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -2431,8 +2431,7 @@ static void mr6_netlink_event(struct mr_table *mrt, struct mfc6_cache *mfc, errout: kfree_skb(skb); - if (err < 0) - rtnl_set_sk_err(net, RTNLGRP_IPV6_MROUTE, err); + rtnl_set_sk_err(net, RTNLGRP_IPV6_MROUTE, err); } static size_t mrt6msg_netlink_msgsize(size_t payloadlen)
The initial value of err is -ENOBUFS, and err is guaranteed to be less than 0 before all goto errout. Therefore, on the error path of errout, there is no need to repeatedly judge that err is less than 0, and delete redundant judgments to make the code more concise. Signed-off-by: Li Zetao <lizetao1@huawei.com> --- net/ipv6/ip6mr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)