From e3370c101956fc68ca14e51c0cb2371286acb69d Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 14 Nov 2011 14:08:05 +0000 Subject: [PATCH] --- yaml --- r: 275707 b: refs/heads/master c: eec205719e97c95a422d0aa384d0517f6c74fc0a h: refs/heads/master i: 275705: 7f50eb81f452404ca76fce3fc76eaf5b4b02697e 275703: fd9f4704ecc8e4584589abd4846bc7f62a69ecf4 v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 475b0b01ac24..22fe6712f006 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8b8a80f2d5f2960482292d961df18a776e3e524 +refs/heads/master: eec205719e97c95a422d0aa384d0517f6c74fc0a diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index ab10e84eda3a..82a6f34d39d0 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/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,