patch-1.3.6 linux/net/core/sock.c

• Lines: 64
• Date: Thu Jun 29 19:18:52 1995
• Orig file: v1.3.5/linux/net/core/sock.c
• Orig date: Tue Jun 6 12:16:43 1995

diff -u --recursive --new-file v1.3.5/linux/net/core/sock.c linux/net/core/sock.c
@@ -314,7 +314,7 @@
 				unsigned long flags;
 				save_flags(flags);
 				cli();
-				sk->wmem_alloc+= c->mem_len;
+				sk->wmem_alloc+= c->truesize;
 				restore_flags(flags); /* was sti(); */
 			}
 			return c;
@@ -337,7 +337,7 @@
 				unsigned long flags;
 				save_flags(flags);
 				cli();
-				sk->rmem_alloc += c->mem_len;
+				sk->rmem_alloc += c->truesize;
 				restore_flags(flags); /* was sti(); */
 			}
 			return(c);
@@ -379,18 +379,19 @@
 }
 
 
-void sock_wfree(struct sock *sk, struct sk_buff *skb, unsigned long size)
+void sock_wfree(struct sock *sk, struct sk_buff *skb)
 {
+	int s=skb->truesize;
 #ifdef CONFIG_SKB_CHECK
 	IS_SKB(skb);
 #endif
-	kfree_skbmem(skb, size);
+	kfree_skbmem(skb);
 	if (sk) 
 	{
 		unsigned long flags;
 		save_flags(flags);
 		cli();
-		sk->wmem_alloc -= size;
+		sk->wmem_alloc -= s;
 		restore_flags(flags);
 		/* In case it might be waiting for more memory. */
 		sk->write_space(sk);
@@ -399,18 +400,19 @@
 }
 
 
-void sock_rfree(struct sock *sk, struct sk_buff *skb, unsigned long size)
+void sock_rfree(struct sock *sk, struct sk_buff *skb)
 {
+	int s=skb->truesize;
 #ifdef CONFIG_SKB_CHECK
 	IS_SKB(skb);
 #endif	
-	kfree_skbmem(skb, size);
+	kfree_skbmem(skb);
 	if (sk) 
 	{
 		unsigned long flags;
 		save_flags(flags);
 		cli();
-		sk->rmem_alloc -= size;
+		sk->rmem_alloc -= s;
 		restore_flags(flags);
 	}
 }