From 471dc94b3c438d61b3387e3e52256d13b4cf8e5d Mon Sep 17 00:00:00 2001 From: "danborkmann@iogearbox.net" Date: Fri, 10 Aug 2012 22:48:54 +0000 Subject: [PATCH] --- yaml --- r: 321598 b: refs/heads/master c: 7f5c3e3a80e6654cf48dfba7cf94f88c6b505467 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a0ac0a9cad33..b798f584214d 100644 --- 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 index f016f6634a79..8ac890a1a4c0 100644 --- 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);