---

yaml --- r: 321598 b: refs/heads/master c: 7f5c3e3 h: refs/heads/master v: v3
git-mirror · Aug 12, 2012 · 471dc94 · 471dc94
1 parent ce7bce3
commit 471dc94
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a7f8c34fefb109903af9a0fac6d0d05f93335c5
+refs/heads/master: 7f5c3e3a80e6654cf48dfba7cf94f88c6b505467
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
@@ -1936,7 +1936,6 @@ static void tpacket_destruct_skb(struct sk_buff *skb)
 
 	if (likely(po->tx_ring.pg_vec)) {
 		ph = skb_shinfo(skb)->destructor_arg;
-		BUG_ON(__packet_get_status(po, ph) != TP_STATUS_SENDING);
 		BUG_ON(atomic_read(&po->tx_ring.pending) == 0);
 		atomic_dec(&po->tx_ring.pending);
 		__packet_set_status(po, ph, TP_STATUS_AVAILABLE);