Skip to content

Commit

Permalink
net/packet: remove dead code and unneeded variable from prb_setup_ret…
Browse files Browse the repository at this point in the history
…ire_blk_timer()

We test for 'tx_ring' being != zero and BUG() if that's the case. So after
that check there is no way that 'tx_ring' could be anything _but_ zero, so
testing it again is just dead code. Once that dead code is removed, the
'pkc' local variable becomes entirely redundant, so remove that as well.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jesper Juhl authored and David S. Miller committed Nov 14, 2011
1 parent 4b90a60 commit 3ed90f7
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions net/packet/af_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 3ed90f7

Please sign in to comment.