From 0c418c9fc757bf000b24de048fa5825d5882287d Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 14 Aug 2005 19:26:34 -0700
Subject: [PATCH] --- yaml --- r: 6363 b: refs/heads/master c:
 db080529798b497eb5a37b92a25e966be5a7dd5d h: refs/heads/master i:   6361:
 09b000c00c7bf75786f2b245a0bbd307fb5a2003   6359:
 1d94c542d45ecc70b0dee59995ffbcdc33103bff v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/netlink.h  | 1 -
 trunk/net/ipv4/fib_frontend.c  | 1 -
 trunk/net/netlink/af_netlink.c | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6737e46302e1..a61eca7b84b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43e943c32b9213b5d25407b281c94aaa474fd9a6
+refs/heads/master: db080529798b497eb5a37b92a25e966be5a7dd5d
diff --git a/trunk/include/linux/netlink.h b/trunk/include/linux/netlink.h
index d5e09bcd80f9..eab51f9c9c86 100644
--- a/trunk/include/linux/netlink.h
+++ b/trunk/include/linux/netlink.h
@@ -106,7 +106,6 @@ struct netlink_skb_parms
 {
 	struct ucred		creds;		/* Skb credentials	*/
 	__u32			pid;
-	__u32			groups;
 	__u32			dst_pid;
 	__u32			dst_groups;
 	kernel_cap_t		eff_cap;
diff --git a/trunk/net/ipv4/fib_frontend.c b/trunk/net/ipv4/fib_frontend.c
index b5e2f1550c91..75d03e37b9a8 100644
--- a/trunk/net/ipv4/fib_frontend.c
+++ b/trunk/net/ipv4/fib_frontend.c
@@ -558,7 +558,6 @@ static void nl_fib_input(struct sock *sk, int len)
 	nl_fib_lookup(frn, tb);
 	
 	pid = nlh->nlmsg_pid;           /*pid of sending process */
-	NETLINK_CB(skb).groups = 0;     /* not in mcast group */
 	NETLINK_CB(skb).pid = 0;         /* from kernel */
 	NETLINK_CB(skb).dst_pid = pid;
 	NETLINK_CB(skb).dst_groups = 0;  /* unicast */
diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
index 5d487cd69c8c..7b7b45a19597 100644
--- a/trunk/net/netlink/af_netlink.c
+++ b/trunk/net/netlink/af_netlink.c
@@ -950,7 +950,6 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
 		goto out;
 
 	NETLINK_CB(skb).pid	= nlk->pid;
-	NETLINK_CB(skb).groups	= nlk->groups;
 	NETLINK_CB(skb).dst_pid = dst_pid;
 	NETLINK_CB(skb).dst_groups = dst_groups;
 	NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context);