diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/fib_frontend.c | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 4 |
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); |