patch-1.3.6 linux/drivers/net/sk_g16.c

• Lines: 26
• Date: Thu Jun 29 19:18:51 1995
• Orig file: v1.3.5/linux/drivers/net/sk_g16.c
• Orig date: Tue Jun 27 14:11:36 1995

diff -u --recursive --new-file v1.3.5/linux/drivers/net/sk_g16.c linux/drivers/net/sk_g16.c
@@ -1570,7 +1570,7 @@
 	    int len = (rmdp->mlen & 0x0fff);  /* extract message length from receive buffer */
 	    struct sk_buff *skb;
 
-	    skb = alloc_skb(len, GFP_ATOMIC); /* allocate socket buffer */ 
+	    skb = dev_alloc_skb(len); /* allocate socket buffer */ 
 
 	    if (skb == NULL)                /* Could not get mem ? */
 	    {
@@ -1590,7 +1590,6 @@
 	    
 	    /* Prepare sk_buff to queue for upper layers */
 
-            skb->len = len;
 	    skb->dev = dev;
 	    
 	    /* 
@@ -1600,7 +1599,7 @@
 	     * ignore status fields) 
 	     */
 
-	    memcpy(skb->data, (unsigned char *) (rmdp->u.buffer & 0x00ffffff),
+	    memcpy(skb_put(skb,len), (unsigned char *) (rmdp->u.buffer & 0x00ffffff),
 		   len);