aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-11-14 00:09:21 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-14 00:09:21 -0500
commit3ed90f766dab55fc9d49638a02704becaec379ae (patch)
treeb7636c636c01c8d3a9f2da5e44e34393dd54595c /net
parent4b90a603a1b21d63cf743cc833680cb195a729f6 (diff)
net/packet: remove dead code and unneeded variable from prb_setup_retire_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>
Diffstat (limited to 'net')
-rw-r--r--net/packet/af_packet.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 82a6f34d39d..ab10e84eda3 100644
--- a/net/packet/af_packet.c
+++ b/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,