Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15

1 files changed, 0 insertions, 3 deletions

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 291df2e4c49..5ca283537bc 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -740,11 +740,8 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long t
 
 int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol)
 {
-        struct netlink_sock *nlk;
         int len = skb->len;
 
-        nlk = nlk_sk(sk);
-
         skb_queue_tail(&sk->sk_receive_queue, skb);
         sk->sk_data_ready(sk, len);
         sock_put(sk);