patch-2.2.18 linux/net/ipv4/tcp.c

• Lines: 18
• Date: Thu Oct 19 01:19:03 2000
• Orig file: v2.2.17/net/ipv4/tcp.c
• Orig date: Sat Sep 9 18:42:51 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp.c,v 1.140.2.11 2000/04/17 05:57:01 davem Exp $
+ * Version:	$Id: tcp.c,v 1.140.2.15 2000/10/06 23:29:33 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -922,7 +922,7 @@
 				tmp += copy;
 				queue_it = 0;
 			}
-			skb = sock_wmalloc_err(sk, tmp, 0, GFP_KERNEL, &err);
+			skb = sock_wmalloc_err(sk, tmp, 0, sk->allocation, &err);
 
 			/* If we didn't get any memory, we need to sleep. */
 			if (skb == NULL) {