diff --git a/[refs] b/[refs] index 2efc4b0f4e47..d103f39349b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b95ede6f6116ae1c0ed9605ec97d856c4814569 +refs/heads/master: 9ee6b7f1556e7889eff4666483b1b554d4686cd4 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index fa76f04fa9c6..88094cb09c06 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -270,7 +270,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) int err = 0; int skb_len; - /* Cast skb->rcvbuf to unsigned... It's pointless, but reduces + /* Cast sk->rcvbuf to unsigned... It's pointless, but reduces number of warnings when compiling with -W --ANK */ if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=