aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-01-24 00:20:07 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:53:35 -0500
commitb24b8a247ff65c01b252025926fe564209fae4fc (patch)
tree8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/llc
parenta92aa318b4b369091fd80433c80e62838db8bc1c (diff)
[NET]: Convert init_timer into setup_timer
Many-many code in the kernel initialized the timer->function and timer->data together with calling init_timer(timer). There is already a helper for this. Use it for networking code. The patch is HUGE, but makes the code 130 lines shorter (98 insertions(+), 228 deletions(-)). Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
-rw-r--r--net/llc/llc_conn.c20
-rw-r--r--net/llc/llc_station.c5
2 files changed, 10 insertions, 15 deletions
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 5c0b484237c8..441bc18f996d 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -831,25 +831,21 @@ static void llc_sk_init(struct sock* sk)
831 llc->inc_cntr = llc->dec_cntr = 2; 831 llc->inc_cntr = llc->dec_cntr = 2;
832 llc->dec_step = llc->connect_step = 1; 832 llc->dec_step = llc->connect_step = 1;
833 833
834 init_timer(&llc->ack_timer.timer); 834 setup_timer(&llc->ack_timer.timer, llc_conn_ack_tmr_cb,
835 (unsigned long)sk);
835 llc->ack_timer.expire = sysctl_llc2_ack_timeout; 836 llc->ack_timer.expire = sysctl_llc2_ack_timeout;
836 llc->ack_timer.timer.data = (unsigned long)sk;
837 llc->ack_timer.timer.function = llc_conn_ack_tmr_cb;
838 837
839 init_timer(&llc->pf_cycle_timer.timer); 838 setup_timer(&llc->pf_cycle_timer.timer, llc_conn_pf_cycle_tmr_cb,
839 (unsigned long)sk);
840 llc->pf_cycle_timer.expire = sysctl_llc2_p_timeout; 840 llc->pf_cycle_timer.expire = sysctl_llc2_p_timeout;
841 llc->pf_cycle_timer.timer.data = (unsigned long)sk;
842 llc->pf_cycle_timer.timer.function = llc_conn_pf_cycle_tmr_cb;
843 841
844 init_timer(&llc->rej_sent_timer.timer); 842 setup_timer(&llc->rej_sent_timer.timer, llc_conn_rej_tmr_cb,
843 (unsigned long)sk);
845 llc->rej_sent_timer.expire = sysctl_llc2_rej_timeout; 844 llc->rej_sent_timer.expire = sysctl_llc2_rej_timeout;
846 llc->rej_sent_timer.timer.data = (unsigned long)sk;
847 llc->rej_sent_timer.timer.function = llc_conn_rej_tmr_cb;
848 845
849 init_timer(&llc->busy_state_timer.timer); 846 setup_timer(&llc->busy_state_timer.timer, llc_conn_busy_tmr_cb,
847 (unsigned long)sk);
850 llc->busy_state_timer.expire = sysctl_llc2_busy_timeout; 848 llc->busy_state_timer.expire = sysctl_llc2_busy_timeout;
851 llc->busy_state_timer.timer.data = (unsigned long)sk;
852 llc->busy_state_timer.timer.function = llc_conn_busy_tmr_cb;
853 849
854 llc->n2 = 2; /* max retransmit */ 850 llc->n2 = 2; /* max retransmit */
855 llc->k = 2; /* tx win size, will adjust dynam */ 851 llc->k = 2; /* tx win size, will adjust dynam */
diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c
index 576355a192ab..6f2ea2090322 100644
--- a/net/llc/llc_station.c
+++ b/net/llc/llc_station.c
@@ -688,9 +688,8 @@ int __init llc_station_init(void)
688 skb_queue_head_init(&llc_main_station.mac_pdu_q); 688 skb_queue_head_init(&llc_main_station.mac_pdu_q);
689 skb_queue_head_init(&llc_main_station.ev_q.list); 689 skb_queue_head_init(&llc_main_station.ev_q.list);
690 spin_lock_init(&llc_main_station.ev_q.lock); 690 spin_lock_init(&llc_main_station.ev_q.lock);
691 init_timer(&llc_main_station.ack_timer); 691 setup_timer(&llc_main_station.ack_timer, llc_station_ack_tmr_cb,
692 llc_main_station.ack_timer.data = (unsigned long)&llc_main_station; 692 (unsigned long)&llc_main_station);
693 llc_main_station.ack_timer.function = llc_station_ack_tmr_cb;
694 llc_main_station.ack_timer.expires = jiffies + 693 llc_main_station.ack_timer.expires = jiffies +
695 sysctl_llc_station_ack_timeout; 694 sysctl_llc_station_ack_timeout;
696 skb = alloc_skb(0, GFP_ATOMIC); 695 skb = alloc_skb(0, GFP_ATOMIC);