Commit fc8bcaa0 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

net: LLC: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Hans Liljestrand <ishkamiel@gmail.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: "Reshetova, Elena" <elena.reshetova@intel.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8dbd05ff

include/net/llc_c_ac.h

+4 −4
Original line number Diff line number Diff line
@@ -171,10 +171,10 @@ int llc_conn_ac_rst_sendack_flag(struct sock *sk, struct sk_buff *skb); 
int llc_conn_ac_send_i_rsp_as_ack(struct sock *sk, struct sk_buff *skb);

int llc_conn_ac_send_i_as_ack(struct sock *sk, struct sk_buff *skb);



void llc_conn_busy_tmr_cb(unsigned long timeout_data);

void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data);

void llc_conn_ack_tmr_cb(unsigned long timeout_data);

void llc_conn_rej_tmr_cb(unsigned long timeout_data);

void llc_conn_busy_tmr_cb(struct timer_list *t);

void llc_conn_pf_cycle_tmr_cb(struct timer_list *t);

void llc_conn_ack_tmr_cb(struct timer_list *t);

void llc_conn_rej_tmr_cb(struct timer_list *t);



void llc_conn_set_p_flag(struct sock *sk, u8 value);

#endif /* LLC_C_AC_H */

net/llc/llc_c_ac.c

+17 −10
Original line number Diff line number Diff line
@@ -1318,9 +1318,8 @@ static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb) 
	return 0;

}



static void llc_conn_tmr_common_cb(unsigned long timeout_data, u8 type)

static void llc_conn_tmr_common_cb(struct sock *sk, u8 type)

{

	struct sock *sk = (struct sock *)timeout_data;

	struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);



	bh_lock_sock(sk);
@@ -1334,24 +1333,32 @@ static void llc_conn_tmr_common_cb(unsigned long timeout_data, u8 type) 
	bh_unlock_sock(sk);

}



void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data)

void llc_conn_pf_cycle_tmr_cb(struct timer_list *t)

{

	llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_P_TMR);

	struct llc_sock *llc = from_timer(llc, t, pf_cycle_timer.timer);



	llc_conn_tmr_common_cb(&llc->sk, LLC_CONN_EV_TYPE_P_TMR);

}



void llc_conn_busy_tmr_cb(unsigned long timeout_data)

void llc_conn_busy_tmr_cb(struct timer_list *t)

{

	llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_BUSY_TMR);

	struct llc_sock *llc = from_timer(llc, t, busy_state_timer.timer);



	llc_conn_tmr_common_cb(&llc->sk, LLC_CONN_EV_TYPE_BUSY_TMR);

}



void llc_conn_ack_tmr_cb(unsigned long timeout_data)

void llc_conn_ack_tmr_cb(struct timer_list *t)

{

	llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_ACK_TMR);

	struct llc_sock *llc = from_timer(llc, t, ack_timer.timer);



	llc_conn_tmr_common_cb(&llc->sk, LLC_CONN_EV_TYPE_ACK_TMR);

}



void llc_conn_rej_tmr_cb(unsigned long timeout_data)

void llc_conn_rej_tmr_cb(struct timer_list *t)

{

	llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_REJ_TMR);

	struct llc_sock *llc = from_timer(llc, t, rej_sent_timer.timer);



	llc_conn_tmr_common_cb(&llc->sk, LLC_CONN_EV_TYPE_REJ_TMR);

}



int llc_conn_ac_rst_vs(struct sock *sk, struct sk_buff *skb)

net/llc/llc_conn.c

+4 −8
Original line number Diff line number Diff line
@@ -902,20 +902,16 @@ static void llc_sk_init(struct sock *sk) 
	llc->inc_cntr = llc->dec_cntr = 2;

	llc->dec_step = llc->connect_step = 1;



	setup_timer(&llc->ack_timer.timer, llc_conn_ack_tmr_cb,

			(unsigned long)sk);

	timer_setup(&llc->ack_timer.timer, llc_conn_ack_tmr_cb, 0);

	llc->ack_timer.expire	      = sysctl_llc2_ack_timeout;



	setup_timer(&llc->pf_cycle_timer.timer, llc_conn_pf_cycle_tmr_cb,

			(unsigned long)sk);

	timer_setup(&llc->pf_cycle_timer.timer, llc_conn_pf_cycle_tmr_cb, 0);

	llc->pf_cycle_timer.expire	   = sysctl_llc2_p_timeout;



	setup_timer(&llc->rej_sent_timer.timer, llc_conn_rej_tmr_cb,

			(unsigned long)sk);

	timer_setup(&llc->rej_sent_timer.timer, llc_conn_rej_tmr_cb, 0);

	llc->rej_sent_timer.expire	   = sysctl_llc2_rej_timeout;



	setup_timer(&llc->busy_state_timer.timer, llc_conn_busy_tmr_cb,

			(unsigned long)sk);

	timer_setup(&llc->busy_state_timer.timer, llc_conn_busy_tmr_cb, 0);

	llc->busy_state_timer.expire	     = sysctl_llc2_busy_timeout;



	llc->n2 = 2;   /* max retransmit */

CRA Git | Maintained and supported by SUSTech CRA and CCSE