diff options
| author | Jesper Juhl <jj@chaosbits.net> | 2011-11-14 15:08:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-15 03:49:46 +0100 |
| commit | eec205719e97c95a422d0aa384d0517f6c74fc0a (patch) | |
| tree | 99eacd50280e9bf886c45b6dbc5562c140d89f32 /net | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| download | linux-eec205719e97c95a422d0aa384d0517f6c74fc0a.tar.xz linux-eec205719e97c95a422d0aa384d0517f6c74fc0a.zip | |
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.c | 6 |
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, |