diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:50:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:50:37 -0700 |
| commit | 236fa08168dd82af29a76c31c40b4148403774c0 (patch) | |
| tree | 73456604747ede3536a5b851ce4615aab96237f7 /net/netlink | |
| parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
| parent | dcab5e1eeccf5e226c771ecc013631cde157435f (diff) | |
| download | linux-236fa08168dd82af29a76c31c40b4148403774c0.tar.gz linux-236fa08168dd82af29a76c31c40b4148403774c0.tar.bz2 linux-236fa08168dd82af29a76c31c40b4148403774c0.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 291df2e4c492..5ca283537bc6 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); |