---

yaml --- r: 134763 b: refs/heads/master c: acb5d75 h: refs/heads/master i: 134761: e412b67 134759: 239c114 v: v3
git-mirror · Feb 27, 2009 · 35e2096 · 35e2096
1 parent ae479f4
commit 35e2096
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce030edfb4ba6734248b8d9f98d0a6f1dcd142e7
+refs/heads/master: acb5d75b9bcff73d32d3471a9b3e9a4189223e48
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
@@ -756,8 +756,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
 	spin_unlock(&sk->sk_receive_queue.lock);
 
 	sk->sk_data_ready(sk, 0);
-	if (copy_skb)
-		kfree_skb(copy_skb);
+	kfree_skb(copy_skb);
 	goto drop_n_restore;
 }