summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-11-14 14:08:05 +0000
committerDavid S. Miller <davem@davemloft.net>2011-11-14 21:49:46 -0500
commiteec205719e97c95a422d0aa384d0517f6c74fc0a (patch)
tree99eacd50280e9bf886c45b6dbc5562c140d89f32 /net
parentf8b8a80f2d5f2960482292d961df18a776e3e524 (diff)
downloadlinux-eec205719e97c95a422d0aa384d0517f6c74fc0a.tar.bz2
net/packet: Revert incorrect dead-code changes to prb_setup_retire_blk_timer
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, 4 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index ab10e84eda3a..82a6f34d39d0 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -516,11 +516,13 @@ 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();
- prb_init_blk_timer(po, &po->rx_ring.prb_bdqc,
- prb_retire_rx_blk_timer_expired);
+ 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);
}
static int prb_calc_retire_blk_tmo(struct packet_sock *po,