Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e9b8269 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[NETLINK]: Remove unused dst_pid field in netlink_skb_parms 



The destination PID is passed directly to netlink_unicast()
respectively netlink_multicast().

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d61c167d

include/linux/netlink.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ struct netlink_skb_parms 
{

	struct ucred		creds;		/* Skb credentials	*/

	__u32			pid;

	__u32			dst_pid;

	__u32			dst_group;

	kernel_cap_t		eff_cap;

	__u32			loginuid;	/* Login (audit) uid */

net/decnet/dn_route.c

+0 −2
Original line number Diff line number Diff line
@@ -1592,8 +1592,6 @@ int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void *arg) 
	if (rtm->rtm_flags & RTM_F_NOTIFY)

		rt->rt_flags |= RTCF_NOTIFY;



	NETLINK_CB(skb).dst_pid = NETLINK_CB(in_skb).pid;



	err = dn_rt_fill_info(skb, NETLINK_CB(in_skb).pid, nlh->nlmsg_seq, RTM_NEWROUTE, 0, 0);



	if (err == 0)

net/ipv4/fib_frontend.c

+0 −1
Original line number Diff line number Diff line
@@ -811,7 +811,6 @@ static void nl_fib_input(struct sock *sk, int len) 
	

	pid = nlh->nlmsg_pid;           /*pid of sending process */

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

	NETLINK_CB(skb).dst_pid = pid;

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

	netlink_unicast(sk, skb, pid, MSG_DONTWAIT);

}

net/ipv4/netfilter/ip_conntrack_netlink.c

+1 −3
Original line number Diff line number Diff line
@@ -743,7 +743,6 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb, 
		ip_conntrack_put(ct);

		return -ENOMEM;

	}

	NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;



	err = ctnetlink_fill_info(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq, 

				  IPCTNL_MSG_CT_NEW, 1, ct);
@@ -1273,7 +1272,6 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, 
	skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);

	if (!skb2)

		goto out;

	NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;



	err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid, 

				      nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW,

net/netfilter/nf_conntrack_netlink.c

+1 −3
Original line number Diff line number Diff line
@@ -752,7 +752,6 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb, 
		nf_ct_put(ct);

		return -ENOMEM;

	}

	NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;



	err = ctnetlink_fill_info(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq, 

				  IPCTNL_MSG_CT_NEW, 1, ct);
@@ -1300,7 +1299,6 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, 
	skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);

	if (!skb2)

		goto out;

	NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;



	err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid, 

				      nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW,