From 372e6e45faace4036051e6e7fc1efe8c16279355 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 14 Nov 2011 00:09:21 -0500 Subject: [PATCH] --- yaml --- r: 275688 b: refs/heads/master c: 3ed90f766dab55fc9d49638a02704becaec379ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 98ad00d045ab..5cb47d108fc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b90a603a1b21d63cf743cc833680cb195a729f6 +refs/heads/master: 3ed90f766dab55fc9d49638a02704becaec379ae diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index 82a6f34d39d0..ab10e84eda3a 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -516,13 +516,11 @@ static void prb_init_blk_timer(struct packet_sock *po, static void prb_setup_retire_blk_timer(struct packet_sock *po, int tx_ring) { - struct tpacket_kbdq_core *pkc; - if (tx_ring) BUG(); - pkc = tx_ring ? &po->tx_ring.prb_bdqc : &po->rx_ring.prb_bdqc; - prb_init_blk_timer(po, pkc, prb_retire_rx_blk_timer_expired); + prb_init_blk_timer(po, &po->rx_ring.prb_bdqc, + prb_retire_rx_blk_timer_expired); } static int prb_calc_retire_blk_tmo(struct packet_sock *po,