diff --git a/[refs] b/[refs] index de90edee15b2..84845e5306d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b57ef81ff8ffb830e1b3e404d692e55161992d27 +refs/heads/master: 2c64580046a122fa15bb586d8ca4fd5e4b69a1e7 diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c index a0abfe0a537c..86a258d9af84 100644 --- a/trunk/net/netlink/af_netlink.c +++ b/trunk/net/netlink/af_netlink.c @@ -959,7 +959,7 @@ static int netlink_broadcast_deliver(struct sock *sk, struct sk_buff *skb) skb_set_owner_r(skb, sk); skb_queue_tail(&sk->sk_receive_queue, skb); sk->sk_data_ready(sk, skb->len); - return atomic_read(&sk->sk_rmem_alloc) > sk->sk_rcvbuf; + return atomic_read(&sk->sk_rmem_alloc) > (sk->sk_rcvbuf >> 1); } return -1; }