Commit 4e9b82693542003b028c8494e9e3c49615b91ce7

Authored by Thomas Graf
Committed by David S. Miller
1 parent d61c167dd0

[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: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 7 changed files with 2 additions and 13 deletions Side-by-side Diff

include/linux/netlink.h
... ... @@ -141,7 +141,6 @@
141 141 {
142 142 struct ucred creds; /* Skb credentials */
143 143 __u32 pid;
144   - __u32 dst_pid;
145 144 __u32 dst_group;
146 145 kernel_cap_t eff_cap;
147 146 __u32 loginuid; /* Login (audit) uid */
net/decnet/dn_route.c
... ... @@ -1592,8 +1592,6 @@
1592 1592 if (rtm->rtm_flags & RTM_F_NOTIFY)
1593 1593 rt->rt_flags |= RTCF_NOTIFY;
1594 1594  
1595   - NETLINK_CB(skb).dst_pid = NETLINK_CB(in_skb).pid;
1596   -
1597 1595 err = dn_rt_fill_info(skb, NETLINK_CB(in_skb).pid, nlh->nlmsg_seq, RTM_NEWROUTE, 0, 0);
1598 1596  
1599 1597 if (err == 0)
net/ipv4/fib_frontend.c
... ... @@ -811,7 +811,6 @@
811 811  
812 812 pid = nlh->nlmsg_pid; /*pid of sending process */
813 813 NETLINK_CB(skb).pid = 0; /* from kernel */
814   - NETLINK_CB(skb).dst_pid = pid;
815 814 NETLINK_CB(skb).dst_group = 0; /* unicast */
816 815 netlink_unicast(sk, skb, pid, MSG_DONTWAIT);
817 816 }
net/ipv4/netfilter/ip_conntrack_netlink.c
... ... @@ -743,7 +743,6 @@
743 743 ip_conntrack_put(ct);
744 744 return -ENOMEM;
745 745 }
746   - NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;
747 746  
748 747 err = ctnetlink_fill_info(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq,
749 748 IPCTNL_MSG_CT_NEW, 1, ct);
... ... @@ -1273,8 +1272,7 @@
1273 1272 skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
1274 1273 if (!skb2)
1275 1274 goto out;
1276   - NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;
1277   -
  1275 +
1278 1276 err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid,
1279 1277 nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW,
1280 1278 1, exp);
net/netfilter/nf_conntrack_netlink.c
... ... @@ -752,7 +752,6 @@
752 752 nf_ct_put(ct);
753 753 return -ENOMEM;
754 754 }
755   - NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;
756 755  
757 756 err = ctnetlink_fill_info(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq,
758 757 IPCTNL_MSG_CT_NEW, 1, ct);
... ... @@ -1300,8 +1299,7 @@
1300 1299 skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
1301 1300 if (!skb2)
1302 1301 goto out;
1303   - NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;
1304   -
  1302 +
1305 1303 err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid,
1306 1304 nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW,
1307 1305 1, exp);
net/netlink/af_netlink.c
... ... @@ -1153,7 +1153,6 @@
1153 1153 goto out;
1154 1154  
1155 1155 NETLINK_CB(skb).pid = nlk->pid;
1156   - NETLINK_CB(skb).dst_pid = dst_pid;
1157 1156 NETLINK_CB(skb).dst_group = dst_group;
1158 1157 NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context);
1159 1158 selinux_get_task_sid(current, &(NETLINK_CB(skb).sid));
net/xfrm/xfrm_user.c
... ... @@ -650,7 +650,6 @@
650 650 if (!skb)
651 651 return ERR_PTR(-ENOMEM);
652 652  
653   - NETLINK_CB(skb).dst_pid = NETLINK_CB(in_skb).pid;
654 653 info.in_skb = in_skb;
655 654 info.out_skb = skb;
656 655 info.nlmsg_seq = seq;
... ... @@ -1168,7 +1167,6 @@
1168 1167 if (!skb)
1169 1168 return ERR_PTR(-ENOMEM);
1170 1169  
1171   - NETLINK_CB(skb).dst_pid = NETLINK_CB(in_skb).pid;
1172 1170 info.in_skb = in_skb;
1173 1171 info.out_skb = skb;
1174 1172 info.nlmsg_seq = seq;