Commit 73d0fcf2 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller

packet: remove handling of tx_ring from prb_shutdown_retire_blk_timer()

Follow e8e85cc5 ("packet: remove handling of tx_ring") and remove
the tx_ring parameter from prb_shutdown_retire_blk_timer() as it is only
called with tx_ring = 0.
Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b88d0a04
...@@ -518,13 +518,11 @@ static void prb_del_retire_blk_timer(struct tpacket_kbdq_core *pkc) ...@@ -518,13 +518,11 @@ static void prb_del_retire_blk_timer(struct tpacket_kbdq_core *pkc)
} }
static void prb_shutdown_retire_blk_timer(struct packet_sock *po, static void prb_shutdown_retire_blk_timer(struct packet_sock *po,
int tx_ring,
struct sk_buff_head *rb_queue) struct sk_buff_head *rb_queue)
{ {
struct tpacket_kbdq_core *pkc; struct tpacket_kbdq_core *pkc;
pkc = tx_ring ? GET_PBDQC_FROM_RB(&po->tx_ring) : pkc = GET_PBDQC_FROM_RB(&po->rx_ring);
GET_PBDQC_FROM_RB(&po->rx_ring);
spin_lock_bh(&rb_queue->lock); spin_lock_bh(&rb_queue->lock);
pkc->delete_blk_timer = 1; pkc->delete_blk_timer = 1;
...@@ -4044,7 +4042,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, ...@@ -4044,7 +4042,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
if (closing && (po->tp_version > TPACKET_V2)) { if (closing && (po->tp_version > TPACKET_V2)) {
/* Because we don't support block-based V3 on tx-ring */ /* Because we don't support block-based V3 on tx-ring */
if (!tx_ring) if (!tx_ring)
prb_shutdown_retire_blk_timer(po, tx_ring, rb_queue); prb_shutdown_retire_blk_timer(po, rb_queue);
} }
release_sock(sk); release_sock(sk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment