summaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-07-28 14:21:26 +0200
committerDavid S. Miller <davem@davemloft.net>2015-07-29 15:11:12 -0700
commit73d0fcf2f487465f73329ee11ae900a774408fe5 (patch)
tree0f29a4aca497bd8972deb116b72bdd42269a442c /net/packet
parentb88d0a049084854aef0ea146f1411eafcd2597a8 (diff)
downloadop-kernel-dev-73d0fcf2f487465f73329ee11ae900a774408fe5.zip
op-kernel-dev-73d0fcf2f487465f73329ee11ae900a774408fe5.tar.gz
packet: remove handling of tx_ring from prb_shutdown_retire_blk_timer()
Follow e8e85cc5eb57 ("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: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
-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 c9e8741..2af8590 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -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,
- int tx_ring,
struct sk_buff_head *rb_queue)
{
struct tpacket_kbdq_core *pkc;
- pkc = tx_ring ? GET_PBDQC_FROM_RB(&po->tx_ring) :
- GET_PBDQC_FROM_RB(&po->rx_ring);
+ pkc = GET_PBDQC_FROM_RB(&po->rx_ring);
spin_lock_bh(&rb_queue->lock);
pkc->delete_blk_timer = 1;
@@ -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)) {
/* Because we don't support block-based V3 on 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);
OpenPOWER on IntegriCloud