aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2006-11-27 12:25:58 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:30:43 -0500
commit4e9b82693542003b028c8494e9e3c49615b91ce7 (patch)
tree955620d0b859b3e5817faafcbe7de6b355bb7d05 /net/ipv4
parentd61c167dd0797a16584f7a922dd5d50efad1d28a (diff)
[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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/fib_frontend.c1
-rw-r--r--net/ipv4/netfilter/ip_conntrack_netlink.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 14025345cc56..d47b72af89ed 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -811,7 +811,6 @@ static void nl_fib_input(struct sock *sk, int len)
811 811
812 pid = nlh->nlmsg_pid; /*pid of sending process */ 812 pid = nlh->nlmsg_pid; /*pid of sending process */
813 NETLINK_CB(skb).pid = 0; /* from kernel */ 813 NETLINK_CB(skb).pid = 0; /* from kernel */
814 NETLINK_CB(skb).dst_pid = pid;
815 NETLINK_CB(skb).dst_group = 0; /* unicast */ 814 NETLINK_CB(skb).dst_group = 0; /* unicast */
816 netlink_unicast(sk, skb, pid, MSG_DONTWAIT); 815 netlink_unicast(sk, skb, pid, MSG_DONTWAIT);
817} 816}
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 55f0ae641081..1bb8ed33c5bc 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -743,7 +743,6 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
743 ip_conntrack_put(ct); 743 ip_conntrack_put(ct);
744 return -ENOMEM; 744 return -ENOMEM;
745 } 745 }
746 NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid;
747 746
748 err = ctnetlink_fill_info(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq, 747 err = ctnetlink_fill_info(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq,
749 IPCTNL_MSG_CT_NEW, 1, ct); 748 IPCTNL_MSG_CT_NEW, 1, ct);
@@ -1273,8 +1272,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,
1273 skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL); 1272 skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
1274 if (!skb2) 1273 if (!skb2)
1275 goto out; 1274 goto out;
1276 NETLINK_CB(skb2).dst_pid = NETLINK_CB(skb).pid; 1275
1277
1278 err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid, 1276 err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid,
1279 nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW, 1277 nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW,
1280 1, exp); 1278 1, exp);