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

This commit is contained in:
Linus Torvalds 2005-10-28 08:50:37 -07:00
commit 236fa08168
19 changed files with 347 additions and 407 deletions

View file

@ -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);