|
@@ -543,15 +543,11 @@ static void prb_init_blk_timer(struct packet_sock *po,
|
|
|
pkc->retire_blk_timer.expires = jiffies;
|
|
|
}
|
|
|
|
|
|
-static void prb_setup_retire_blk_timer(struct packet_sock *po, int tx_ring)
|
|
|
+static void prb_setup_retire_blk_timer(struct packet_sock *po)
|
|
|
{
|
|
|
struct tpacket_kbdq_core *pkc;
|
|
|
|
|
|
- if (tx_ring)
|
|
|
- BUG();
|
|
|
-
|
|
|
- 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);
|
|
|
prb_init_blk_timer(po, pkc, prb_retire_rx_blk_timer_expired);
|
|
|
}
|
|
|
|
|
@@ -607,7 +603,7 @@ static void prb_init_ft_ops(struct tpacket_kbdq_core *p1,
|
|
|
static void init_prb_bdqc(struct packet_sock *po,
|
|
|
struct packet_ring_buffer *rb,
|
|
|
struct pgv *pg_vec,
|
|
|
- union tpacket_req_u *req_u, int tx_ring)
|
|
|
+ union tpacket_req_u *req_u)
|
|
|
{
|
|
|
struct tpacket_kbdq_core *p1 = GET_PBDQC_FROM_RB(rb);
|
|
|
struct tpacket_block_desc *pbd;
|
|
@@ -634,7 +630,7 @@ static void init_prb_bdqc(struct packet_sock *po,
|
|
|
|
|
|
p1->max_frame_len = p1->kblk_size - BLK_PLUS_PRIV(p1->blk_sizeof_priv);
|
|
|
prb_init_ft_ops(p1, req_u);
|
|
|
- prb_setup_retire_blk_timer(po, tx_ring);
|
|
|
+ prb_setup_retire_blk_timer(po);
|
|
|
prb_open_block(p1, pbd);
|
|
|
}
|
|
|
|
|
@@ -4002,7 +3998,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
|
|
|
* it above but just being paranoid
|
|
|
*/
|
|
|
if (!tx_ring)
|
|
|
- init_prb_bdqc(po, rb, pg_vec, req_u, tx_ring);
|
|
|
+ init_prb_bdqc(po, rb, pg_vec, req_u);
|
|
|
break;
|
|
|
default:
|
|
|
break;
|