net: ipv4: Simplify rt_fill_info (0c8d803f) · Commits · 戴 / test

net/ipv4/route.c

+7 −13

Original line number	Diff line number	Diff line
		@@ -2454,7 +2454,7 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow);

		static int rt_fill_info(struct net *net, __be32 dst, __be32 src, u32 table_id,
		struct flowi4 fl4, struct sk_buff skb, u32 portid,
		u32 seq, int event, int nowait, unsigned int flags)
		u32 seq, int event)
		{
		struct rtable *rt = skb_rtable(skb);
		struct rtmsg *r;
		@@ -2463,7 +2463,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src, u32 table_id,
		u32 error;
		u32 metrics[RTAX_MAX];

		nlh = nlmsg_put(skb, portid, seq, event, sizeof(*r), flags);
		nlh = nlmsg_put(skb, portid, seq, event, sizeof(*r), 0);
		if (!nlh)
		return -EMSGSIZE;

		@@ -2541,18 +2541,12 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src, u32 table_id,
		IPV4_DEVCONF_ALL(net, MC_FORWARDING)) {
		int err = ipmr_get_route(net, skb,
		fl4->saddr, fl4->daddr,
		r, nowait, portid);
		r, 0, portid);

		if (err <= 0) {
		if (!nowait) {
		if (err == 0)
		return 0;
		goto nla_put_failure;
		} else {
		if (err == -EMSGSIZE)
		goto nla_put_failure;
		error = err;
		}
		}
		} else
		#endif
		@@ -2665,7 +2659,7 @@ static int inet_rtm_getroute(struct sk_buff in_skb, struct nlmsghdr nlh)

		err = rt_fill_info(net, dst, src, table_id, &fl4, skb,
		NETLINK_CB(in_skb).portid, nlh->nlmsg_seq,
		RTM_NEWROUTE, 0, 0);
		RTM_NEWROUTE);
		if (err < 0)
		goto errout_free;