diff options
| -rw-r--r-- | include/linux/netlink.h | 1 | ||||
| -rw-r--r-- | net/ipv4/fib_frontend.c | 1 | ||||
| -rw-r--r-- | net/netlink/af_netlink.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index d5e09bcd80f9..eab51f9c9c86 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
| @@ -106,7 +106,6 @@ struct netlink_skb_parms | |||
| 106 | { | 106 | { |
| 107 | struct ucred creds; /* Skb credentials */ | 107 | struct ucred creds; /* Skb credentials */ |
| 108 | __u32 pid; | 108 | __u32 pid; |
| 109 | __u32 groups; | ||
| 110 | __u32 dst_pid; | 109 | __u32 dst_pid; |
| 111 | __u32 dst_groups; | 110 | __u32 dst_groups; |
| 112 | kernel_cap_t eff_cap; | 111 | kernel_cap_t eff_cap; |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index b5e2f1550c91..75d03e37b9a8 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
| @@ -558,7 +558,6 @@ static void nl_fib_input(struct sock *sk, int len) | |||
| 558 | nl_fib_lookup(frn, tb); | 558 | nl_fib_lookup(frn, tb); |
| 559 | 559 | ||
| 560 | pid = nlh->nlmsg_pid; /*pid of sending process */ | 560 | pid = nlh->nlmsg_pid; /*pid of sending process */ |
| 561 | NETLINK_CB(skb).groups = 0; /* not in mcast group */ | ||
| 562 | NETLINK_CB(skb).pid = 0; /* from kernel */ | 561 | NETLINK_CB(skb).pid = 0; /* from kernel */ |
| 563 | NETLINK_CB(skb).dst_pid = pid; | 562 | NETLINK_CB(skb).dst_pid = pid; |
| 564 | NETLINK_CB(skb).dst_groups = 0; /* unicast */ | 563 | NETLINK_CB(skb).dst_groups = 0; /* unicast */ |
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 5d487cd69c8c..7b7b45a19597 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -950,7 +950,6 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 950 | goto out; | 950 | goto out; |
| 951 | 951 | ||
| 952 | NETLINK_CB(skb).pid = nlk->pid; | 952 | NETLINK_CB(skb).pid = nlk->pid; |
| 953 | NETLINK_CB(skb).groups = nlk->groups; | ||
| 954 | NETLINK_CB(skb).dst_pid = dst_pid; | 953 | NETLINK_CB(skb).dst_pid = dst_pid; |
| 955 | NETLINK_CB(skb).dst_groups = dst_groups; | 954 | NETLINK_CB(skb).dst_groups = dst_groups; |
| 956 | NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context); | 955 | NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context); |
