patch-1.3.6 linux/net/ipv4/packet.c

• Lines: 73
• Date: Thu Jun 29 19:18:52 1995
• Orig file: v1.3.5/linux/net/ipv4/packet.c
• Orig date: Tue Jun 6 12:16:44 1995

diff -u --recursive --new-file v1.3.5/linux/net/ipv4/packet.c linux/net/ipv4/packet.c
@@ -82,13 +82,10 @@
 	sk = (struct sock *) pt->data;	
 
 	/*
-	 *	The SOCK_PACKET socket receives _all_ frames, and as such 
-	 *	therefore needs to put the header back onto the buffer.
-	 *	(it was removed by inet_bh()).
+	 *	The SOCK_PACKET socket receives _all_ frames.
 	 */
 	 
 	skb->dev = dev;
-	skb->len += dev->hard_header_len;
 
 	/*
 	 *	Charge the memory to the socket. This is done specifically
@@ -100,9 +97,9 @@
 		sk->rmem_alloc = 0;
 	}
 
-	if (sk->rmem_alloc + skb->mem_len >= sk->rcvbuf) 
+	if (sk->rmem_alloc + skb->truesize >= sk->rcvbuf) 
 	{
-/*	        printk("packet_rcv: drop, %d+%d>%d\n", sk->rmem_alloc, skb->mem_len, sk->rcvbuf); */
+/*	        printk("packet_rcv: drop, %d+%d>%d\n", sk->rmem_alloc, skb->truesize, sk->rcvbuf); */
 		skb->sk = NULL;
 		kfree_skb(skb, FREE_READ);
 		return(0);
@@ -112,7 +109,7 @@
 	cli();
 
 	skb->sk = sk;
-	sk->rmem_alloc += skb->mem_len;	
+	sk->rmem_alloc += skb->truesize;	
 
 	/*
 	 *	Queue the packet up, and wake anyone waiting for it.
@@ -201,8 +198,7 @@
 	 
 	skb->sk = sk;
 	skb->free = 1;
-	memcpy_fromfs(skb->data, from, len);
-	skb->len = len;
+	memcpy_fromfs(skb_put(skb,len), from, len);
 	skb->arp = 1;		/* No ARP needs doing on this (complete) frame */
 
 	/*
@@ -289,7 +285,6 @@
 	struct sk_buff *skb;
 	struct sockaddr *saddr;
 	int err;
-	int truesize;
 
 	saddr = (struct sockaddr *)sin;
 
@@ -326,8 +321,7 @@
 	 *	user program they can ask the device for its MTU anyway.
 	 */
 	 
-	truesize = skb->len;
-	copied = min(len, truesize);
+	copied = min(len, skb->len);
 
 	memcpy_tofs(to, skb->data, copied);	/* We can't use skb_copy_datagram here */
 	sk->stamp=skb->stamp;
@@ -354,7 +348,7 @@
 	 */
 	 
 	release_sock(sk);
-	return(truesize);
+	return(copied);
 }