---

yaml --- r: 203656 b: refs/heads/master c: 70d4bf6 h: refs/heads/master v: v3
git-mirror · Jul 20, 2010 · 99fbdfb · 99fbdfb
1 parent 70dbdc3
commit 99fbdfb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b706372f18de53970e4c6887a96459590fef80a
+refs/heads/master: 70d4bf6d467a330ccc947df9b2608e329d9e7708
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
@@ -407,7 +407,7 @@ static void kauditd_send_skb(struct sk_buff *skb)
 		audit_hold_skb(skb);
 	} else
 		/* drop the extra reference if sent ok */
-		kfree_skb(skb);
+		consume_skb(skb);
 }
 
 static int kauditd_thread(void *dummy)

diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
@@ -1076,14 +1076,15 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 pid,
 	sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list)
 		do_one_broadcast(sk, &info);
 
-	kfree_skb(skb);
+	consume_skb(skb);
 
 	netlink_unlock_table();
 
-	kfree_skb(info.skb2);
-
-	if (info.delivery_failure)
+	if (info.delivery_failure) {
+		kfree_skb(info.skb2);
 		return -ENOBUFS;
+	} else
+		consume_skb(info.skb2);
 
 	if (info.delivered) {
 		if (info.congested && (allocation & __GFP_WAIT))

diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
@@ -1906,7 +1906,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
 				break;
 			}
 
-			kfree_skb(skb);
+			consume_skb(skb);
 
 			if (siocb->scm->fp)
 				break;
-Original file line number
+Diff line change
@@ Expand Up @@
     				break;
     			}
-    			kfree_skb(skb);
+    			consume_skb(skb);
     			if (siocb->scm->fp)
     				break;
@@ Expand Down @@