Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eec20571 authored by Jesper Juhl's avatar Jesper Juhl Committed by David S. Miller
Browse files

net/packet: Revert incorrect dead-code changes to prb_setup_retire_blk_timer 



Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8b8a80f

net/packet/af_packet.c

+4 −2
Original line number Diff line number Diff line
@@ -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,