From 11fb3b1ac2862c1d70e50683eb33f779cbfcf950 Mon Sep 17 00:00:00 2001 From: "danborkmann@iogearbox.net" Date: Mon, 10 Oct 2011 06:52:46 +0000 Subject: [PATCH] --- yaml --- r: 266482 b: refs/heads/master c: 95f5f803b3897f622c4b5f72d554874faf74df12 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f5e1fc079a5..66c4ff14e91d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bdc4f5de1345c221f5b51d73fafe3e5de718a54 +refs/heads/master: 95f5f803b3897f622c4b5f72d554874faf74df12 diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index dac91abf4c0f..7b5f03253016 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -1968,8 +1968,6 @@ static void tpacket_destruct_skb(struct sk_buff *skb) struct packet_sock *po = pkt_sk(skb->sk); void *ph; - BUG_ON(skb == NULL); - if (likely(po->tx_ring.pg_vec)) { ph = skb_shinfo(skb)->destructor_arg; BUG_ON(__packet_get_status(po, ph) != TP_STATUS_SENDING);