Commit c6fc8a36 authored by Li Zetao's avatar Li Zetao Committed by Wentao Guan
Browse files

neighbour: delete redundant judgment statements 

stable inclusion
from stable-v6.6.79
commit 62091d80e1558043400bf7d9756f6159f20cb30b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBXANC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=62091d80e1558043400bf7d9756f6159f20cb30b



--------------------------------

[ Upstream commit c25bdd2ac8cf7da70a226f1a66cdce7af15ff86f ]

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: default avatarLi Zetao <lizetao1@huawei.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: becbd5850c03 ("neighbour: use RCU protection in __neigh_notify()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 62091d80e1558043400bf7d9756f6159f20cb30b)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent bcf3be3b

net/core/neighbour.c

+1 −2
Original line number Diff line number Diff line
@@ -3526,7 +3526,6 @@ static void __neigh_notify(struct neighbour *n, int type, int flags, 
	rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);

	return;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);

}