---

yaml --- r: 40726 b: refs/heads/master c: db38c17 h: refs/heads/master v: v3
git-mirror · Nov 5, 2006 · ff2cc4b · ff2cc4b
1 parent 54f978c
commit ff2cc4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;