Commit 01757f53 authored by Yajun Deng's avatar Yajun Deng Committed by David S. Miller
Browse files

net: Use nlmsg_unicast() instead of netlink_unicast() 



It has 'if (err >0 )' statement in nlmsg_unicast(), so use nlmsg_unicast()
instead of netlink_unicast(), this looks more concise.

v2: remove the change in netfilter.

Signed-off-by: default avatarYajun Deng <yajun.deng@linux.dev>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71ce9d92

net/ipv4/fib_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ static void nl_fib_input(struct sk_buff *skb) 
	portid = NETLINK_CB(skb).portid;      /* netlink portid */

	NETLINK_CB(skb).portid = 0;        /* from kernel */

	NETLINK_CB(skb).dst_group = 0;  /* unicast */

	netlink_unicast(net->ipv4.fibnl, skb, portid, MSG_DONTWAIT);

	nlmsg_unicast(net->ipv4.fibnl, skb, portid);

}



static int __net_init nl_fib_lookup_init(struct net *net)

net/ipv4/inet_diag.c

+1 −4
Original line number Diff line number Diff line
@@ -580,10 +580,7 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, 
		nlmsg_free(rep);

		goto out;

	}

	err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid,

			      MSG_DONTWAIT);

	if (err > 0)

		err = 0;

	err = nlmsg_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid);



out:

	if (sk)

net/ipv4/raw_diag.c

+2 −5
Original line number Diff line number Diff line
@@ -119,11 +119,8 @@ static int raw_diag_dump_one(struct netlink_callback *cb, 
		return err;

	}



	err = netlink_unicast(net->diag_nlsk, rep,

			      NETLINK_CB(in_skb).portid,

			      MSG_DONTWAIT);

	if (err > 0)

		err = 0;

	err = nlmsg_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid);



	return err;

}

net/ipv4/udp_diag.c

+2 −4
Original line number Diff line number Diff line
@@ -77,10 +77,8 @@ static int udp_dump_one(struct udp_table *tbl, 
		kfree_skb(rep);

		goto out;

	}

	err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid,

			      MSG_DONTWAIT);

	if (err > 0)

		err = 0;

	err = nlmsg_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid);



out:

	if (sk)

		sock_put(sk);

net/mptcp/mptcp_diag.c

+2 −4
Original line number Diff line number Diff line
@@ -57,10 +57,8 @@ static int mptcp_diag_dump_one(struct netlink_callback *cb, 
		kfree_skb(rep);

		goto out;

	}

	err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid,

			      MSG_DONTWAIT);

	if (err > 0)

		err = 0;

	err = nlmsg_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).portid);



out:

	sock_put(sk);