gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/net/rose/rose_timer.c
..
..
@@ -1,8 +1,5 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
- * This program is free software; you can redistribute it and/or modify
3
- * it under the terms of the GNU General Public License as published by
4
- * the Free Software Foundation; either version 2 of the License, or
5
- * (at your option) any later version.
6
3
  *
7
4
  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
8
5
  * Copyright (C) 2002 Ralf Baechle DO1GRB (ralf@gnu.org)
..
..
@@ -34,89 +31,89 @@
34
31
 
35
32
 void rose_start_heartbeat(struct sock *sk)
36
33
 {
37
-	del_timer(&sk->sk_timer);
34
+	sk_stop_timer(sk, &sk->sk_timer);
38
35
 
39
36
 	sk->sk_timer.function = rose_heartbeat_expiry;
40
37
 	sk->sk_timer.expires  = jiffies + 5 * HZ;
41
38
 
42
-	add_timer(&sk->sk_timer);
39
+	sk_reset_timer(sk, &sk->sk_timer, sk->sk_timer.expires);
43
40
 }
44
41
 
45
42
 void rose_start_t1timer(struct sock *sk)
46
43
 {
47
44
 	struct rose_sock *rose = rose_sk(sk);
48
45
 
49
-	del_timer(&rose->timer);
46
+	sk_stop_timer(sk, &rose->timer);
50
47
 
51
48
 	rose->timer.function = rose_timer_expiry;
52
49
 	rose->timer.expires  = jiffies + rose->t1;
53
50
 
54
-	add_timer(&rose->timer);
51
+	sk_reset_timer(sk, &rose->timer, rose->timer.expires);
55
52
 }
56
53
 
57
54
 void rose_start_t2timer(struct sock *sk)
58
55
 {
59
56
 	struct rose_sock *rose = rose_sk(sk);
60
57
 
61
-	del_timer(&rose->timer);
58
+	sk_stop_timer(sk, &rose->timer);
62
59
 
63
60
 	rose->timer.function = rose_timer_expiry;
64
61
 	rose->timer.expires  = jiffies + rose->t2;
65
62
 
66
-	add_timer(&rose->timer);
63
+	sk_reset_timer(sk, &rose->timer, rose->timer.expires);
67
64
 }
68
65
 
69
66
 void rose_start_t3timer(struct sock *sk)
70
67
 {
71
68
 	struct rose_sock *rose = rose_sk(sk);
72
69
 
73
-	del_timer(&rose->timer);
70
+	sk_stop_timer(sk, &rose->timer);
74
71
 
75
72
 	rose->timer.function = rose_timer_expiry;
76
73
 	rose->timer.expires  = jiffies + rose->t3;
77
74
 
78
-	add_timer(&rose->timer);
75
+	sk_reset_timer(sk, &rose->timer, rose->timer.expires);
79
76
 }
80
77
 
81
78
 void rose_start_hbtimer(struct sock *sk)
82
79
 {
83
80
 	struct rose_sock *rose = rose_sk(sk);
84
81
 
85
-	del_timer(&rose->timer);
82
+	sk_stop_timer(sk, &rose->timer);
86
83
 
87
84
 	rose->timer.function = rose_timer_expiry;
88
85
 	rose->timer.expires  = jiffies + rose->hb;
89
86
 
90
-	add_timer(&rose->timer);
87
+	sk_reset_timer(sk, &rose->timer, rose->timer.expires);
91
88
 }
92
89
 
93
90
 void rose_start_idletimer(struct sock *sk)
94
91
 {
95
92
 	struct rose_sock *rose = rose_sk(sk);
96
93
 
97
-	del_timer(&rose->idletimer);
94
+	sk_stop_timer(sk, &rose->idletimer);
98
95
 
99
96
 	if (rose->idle > 0) {
100
97
 		rose->idletimer.function = rose_idletimer_expiry;
101
98
 		rose->idletimer.expires  = jiffies + rose->idle;
102
99
 
103
-		add_timer(&rose->idletimer);
100
+		sk_reset_timer(sk, &rose->idletimer, rose->idletimer.expires);
104
101
 	}
105
102
 }
106
103
 
107
104
 void rose_stop_heartbeat(struct sock *sk)
108
105
 {
109
-	del_timer(&sk->sk_timer);
106
+	sk_stop_timer(sk, &sk->sk_timer);
110
107
 }
111
108
 
112
109
 void rose_stop_timer(struct sock *sk)
113
110
 {
114
-	del_timer(&rose_sk(sk)->timer);
111
+	sk_stop_timer(sk, &rose_sk(sk)->timer);
115
112
 }
116
113
 
117
114
 void rose_stop_idletimer(struct sock *sk)
118
115
 {
119
-	del_timer(&rose_sk(sk)->idletimer);
116
+	sk_stop_timer(sk, &rose_sk(sk)->idletimer);
120
117
 }
121
118
 
122
119
 static void rose_heartbeat_expiry(struct timer_list *t)
..
..
@@ -133,6 +130,7 @@
133
130
 		    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
134
131
 			bh_unlock_sock(sk);
135
132
 			rose_destroy_socket(sk);
133
+			sock_put(sk);
136
134
 			return;
137
135
 		}
138
136
 		break;
..
..
@@ -155,6 +153,7 @@
155
153
 
156
154
 	rose_start_heartbeat(sk);
157
155
 	bh_unlock_sock(sk);
156
+	sock_put(sk);
158
157
 }
159
158
 
160
159
 static void rose_timer_expiry(struct timer_list *t)
..
..
@@ -184,6 +183,7 @@
184
183
 		break;
185
184
 	}
186
185
 	bh_unlock_sock(sk);
186
+	sock_put(sk);
187
187
 }
188
188
 
189
189
 static void rose_idletimer_expiry(struct timer_list *t)
..
..
@@ -208,4 +208,5 @@
208
208
 		sock_set_flag(sk, SOCK_DEAD);
209
209
 	}
210
210
 	bh_unlock_sock(sk);
211
+	sock_put(sk);
211
212
 }