diff --git a/[refs] b/[refs] index 08f8ce1e00fa..43847056bc3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f37c6057414fb68024793966b1dcb6a135cb844 +refs/heads/master: db38c179a759a9c4722525e8c9f09ac80e372377 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index d472db4776c3..ee6cd2541d35 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -1160,7 +1160,7 @@ static struct sk_buff *sock_alloc_send_pskb(struct sock *sk, goto failure; if (atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf) { - skb = alloc_skb(header_len, sk->sk_allocation); + skb = alloc_skb(header_len, gfp_mask); if (skb) { int npages; int i;