Commit f9db28bb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-redundant-judgments' 



Li Zetao says:

====================
net: Delete some redundant judgments

This patchset aims to remove some unnecessary judgments and make the
code more concise. In some network modules, rtnl_set_sk_err is used to
record error information, but the err is repeatedly judged to be less
than 0 on the error path. Deleted these redundant judgments.

No functional change intended.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b34a6e73 fb8e83cf

drivers/net/vxlan/vxlan_core.c

+1 −2
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ static void __vxlan_fdb_notify(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb, 
	rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);

	return;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);

}

net/core/fib_rules.c

+1 −2
Original line number Diff line number Diff line
@@ -1205,7 +1205,6 @@ static void notify_rule_change(int event, struct fib_rule *rule, 
	rtnl_notify(skb, net, pid, ops->nlgroup, nlh, GFP_KERNEL);

	return;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, ops->nlgroup, err);

}

net/core/neighbour.c

+1 −2
Original line number Diff line number Diff line
@@ -3530,7 +3530,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);

}

net/core/rtnetlink.c

+1 −2
Original line number Diff line number Diff line
@@ -4087,7 +4087,6 @@ struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev, 
	}

	return skb;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, RTNLGRP_LINK, err);

	return NULL;

}

net/ipv4/devinet.c

+2 −4
Original line number Diff line number Diff line
@@ -1943,7 +1943,6 @@ static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh, 
	rtnl_notify(skb, net, portid, RTNLGRP_IPV4_IFADDR, nlh, GFP_KERNEL);

	return;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err);

}
@@ -2140,7 +2139,6 @@ void inet_netconf_notify_devconf(struct net *net, int event, int type, 
	rtnl_notify(skb, net, 0, RTNLGRP_IPV4_NETCONF, NULL, GFP_KERNEL);

	return;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, RTNLGRP_IPV4_NETCONF, err);

}