1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * X.25 Packet Layer release 002 2 * X.25 Packet Layer release 002
4 * 3 *
5 * This is ALPHA test software. This code 4 * This is ALPHA test software. This code may break your machine,
6 * randomly fail to work with new release 5 * randomly fail to work with new releases, misbehave and/or generally
7 * screw up. It might even work. 6 * screw up. It might even work.
8 * 7 *
9 * This code REQUIRES 2.1.15 or higher 8 * This code REQUIRES 2.1.15 or higher
10 * 9 *
>> 10 * This module:
>> 11 * This module is free software; you can redistribute it and/or
>> 12 * modify it under the terms of the GNU General Public License
>> 13 * as published by the Free Software Foundation; either version
>> 14 * 2 of the License, or (at your option) any later version.
>> 15 *
11 * History 16 * History
12 * X.25 001 Jonathan Naylor Star 17 * X.25 001 Jonathan Naylor Started coding.
13 * X.25 002 Jonathan Naylor Cent 18 * X.25 002 Jonathan Naylor Centralised disconnection code.
14 * New 19 * New timer architecture.
15 * 2000-03-20 Daniela Squassoni Disa 20 * 2000-03-20 Daniela Squassoni Disabling/enabling of facilities
16 * nego 21 * negotiation.
17 * 2000-11-10 Henner Eisen Chec 22 * 2000-11-10 Henner Eisen Check and reset for out-of-sequence
18 * i-fr 23 * i-frames.
19 */ 24 */
20 25
21 #define pr_fmt(fmt) "X25: " fmt 26 #define pr_fmt(fmt) "X25: " fmt
22 27
23 #include <linux/slab.h> 28 #include <linux/slab.h>
24 #include <linux/errno.h> 29 #include <linux/errno.h>
25 #include <linux/kernel.h> 30 #include <linux/kernel.h>
26 #include <linux/string.h> 31 #include <linux/string.h>
27 #include <linux/skbuff.h> 32 #include <linux/skbuff.h>
28 #include <net/sock.h> 33 #include <net/sock.h>
29 #include <net/tcp_states.h> 34 #include <net/tcp_states.h>
30 #include <net/x25.h> 35 #include <net/x25.h>
31 36
32 static int x25_queue_rx_frame(struct sock *sk, 37 static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
33 { 38 {
34 struct sk_buff *skbo, *skbn = skb; 39 struct sk_buff *skbo, *skbn = skb;
35 struct x25_sock *x25 = x25_sk(sk); 40 struct x25_sock *x25 = x25_sk(sk);
36 41
37 if (more) { 42 if (more) {
38 x25->fraglen += skb->len; 43 x25->fraglen += skb->len;
39 skb_queue_tail(&x25->fragment_ 44 skb_queue_tail(&x25->fragment_queue, skb);
40 skb_set_owner_r(skb, sk); 45 skb_set_owner_r(skb, sk);
41 return 0; 46 return 0;
42 } 47 }
43 48
44 if (x25->fraglen > 0) { /* End of frag !! 49 if (!more && x25->fraglen > 0) { /* End of fragment */
45 int len = x25->fraglen + skb-> 50 int len = x25->fraglen + skb->len;
46 51
47 if ((skbn = alloc_skb(len, GFP 52 if ((skbn = alloc_skb(len, GFP_ATOMIC)) == NULL){
48 kfree_skb(skb); 53 kfree_skb(skb);
49 return 1; 54 return 1;
50 } 55 }
51 56
52 skb_queue_tail(&x25->fragment_ 57 skb_queue_tail(&x25->fragment_queue, skb);
53 58
54 skb_reset_transport_header(skb 59 skb_reset_transport_header(skbn);
55 60
56 skbo = skb_dequeue(&x25->fragm 61 skbo = skb_dequeue(&x25->fragment_queue);
57 skb_copy_from_linear_data(skbo 62 skb_copy_from_linear_data(skbo, skb_put(skbn, skbo->len),
58 skbo 63 skbo->len);
59 kfree_skb(skbo); 64 kfree_skb(skbo);
60 65
61 while ((skbo = 66 while ((skbo =
62 skb_dequeue(&x25->frag 67 skb_dequeue(&x25->fragment_queue)) != NULL) {
63 skb_pull(skbo, (x25->n 68 skb_pull(skbo, (x25->neighbour->extended) ?
64 X25_EX 69 X25_EXT_MIN_LEN : X25_STD_MIN_LEN);
65 skb_copy_from_linear_d 70 skb_copy_from_linear_data(skbo,
66 71 skb_put(skbn, skbo->len),
67 72 skbo->len);
68 kfree_skb(skbo); 73 kfree_skb(skbo);
69 } 74 }
70 75
71 x25->fraglen = 0; 76 x25->fraglen = 0;
72 } 77 }
73 78
74 skb_set_owner_r(skbn, sk); 79 skb_set_owner_r(skbn, sk);
75 skb_queue_tail(&sk->sk_receive_queue, 80 skb_queue_tail(&sk->sk_receive_queue, skbn);
76 if (!sock_flag(sk, SOCK_DEAD)) 81 if (!sock_flag(sk, SOCK_DEAD))
77 sk->sk_data_ready(sk); 82 sk->sk_data_ready(sk);
78 83
79 return 0; 84 return 0;
80 } 85 }
81 86
82 /* 87 /*
83 * State machine for state 1, Awaiting Call Ac 88 * State machine for state 1, Awaiting Call Accepted State.
84 * The handling of the timer(s) is in file x25 89 * The handling of the timer(s) is in file x25_timer.c.
85 * Handling of state 0 and connection release 90 * Handling of state 0 and connection release is in af_x25.c.
86 */ 91 */
87 static int x25_state1_machine(struct sock *sk, 92 static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametype)
88 { 93 {
89 struct x25_address source_addr, dest_a 94 struct x25_address source_addr, dest_addr;
90 int len; 95 int len;
91 struct x25_sock *x25 = x25_sk(sk); 96 struct x25_sock *x25 = x25_sk(sk);
92 97
93 switch (frametype) { 98 switch (frametype) {
94 case X25_CALL_ACCEPTED: { 99 case X25_CALL_ACCEPTED: {
95 100
96 x25_stop_timer(sk); 101 x25_stop_timer(sk);
97 x25->condition = 0x00; 102 x25->condition = 0x00;
98 x25->vs = 0; 103 x25->vs = 0;
99 x25->va = 0; 104 x25->va = 0;
100 x25->vr = 0; 105 x25->vr = 0;
101 x25->vl = 0; 106 x25->vl = 0;
102 x25->state = X25_STATE_3; 107 x25->state = X25_STATE_3;
103 sk->sk_state = TCP_ESTABLISH 108 sk->sk_state = TCP_ESTABLISHED;
104 /* 109 /*
105 * Parse the data in the 110 * Parse the data in the frame.
106 */ 111 */
107 if (!pskb_may_pull(skb, X25_ST 112 if (!pskb_may_pull(skb, X25_STD_MIN_LEN))
108 goto out_clear; 113 goto out_clear;
109 skb_pull(skb, X25_STD_MIN_LEN) 114 skb_pull(skb, X25_STD_MIN_LEN);
110 115
111 len = x25_parse_address_block( 116 len = x25_parse_address_block(skb, &source_addr,
112 117 &dest_addr);
113 if (len > 0) 118 if (len > 0)
114 skb_pull(skb, len); 119 skb_pull(skb, len);
115 else if (len < 0) 120 else if (len < 0)
116 goto out_clear; 121 goto out_clear;
117 122
118 len = x25_parse_facilities(skb 123 len = x25_parse_facilities(skb, &x25->facilities,
119 &x2 124 &x25->dte_facilities,
120 &x2 125 &x25->vc_facil_mask);
121 if (len > 0) 126 if (len > 0)
122 skb_pull(skb, len); 127 skb_pull(skb, len);
123 else if (len < 0) 128 else if (len < 0)
124 goto out_clear; 129 goto out_clear;
125 /* 130 /*
126 * Copy any Call User Dat 131 * Copy any Call User Data.
127 */ 132 */
128 if (skb->len > 0) { 133 if (skb->len > 0) {
129 if (skb->len > X25_MAX 134 if (skb->len > X25_MAX_CUD_LEN)
130 goto out_clear 135 goto out_clear;
131 136
132 skb_copy_bits(skb, 0, 137 skb_copy_bits(skb, 0, x25->calluserdata.cuddata,
133 skb->len); 138 skb->len);
134 x25->calluserdata.cudl 139 x25->calluserdata.cudlength = skb->len;
135 } 140 }
136 if (!sock_flag(sk, SOCK_DEAD)) 141 if (!sock_flag(sk, SOCK_DEAD))
137 sk->sk_state_change(sk 142 sk->sk_state_change(sk);
138 break; 143 break;
139 } 144 }
140 case X25_CALL_REQUEST: <<
141 /* call collision */ <<
142 x25->causediag.cause = 0x <<
143 x25->causediag.diagnostic = 0x <<
144 <<
145 x25_write_internal(sk, X25_CLE <<
146 x25_disconnect(sk, EISCONN, 0x <<
147 break; <<
148 <<
149 case X25_CLEAR_REQUEST: 145 case X25_CLEAR_REQUEST:
150 if (!pskb_may_pull(skb, X25_ST 146 if (!pskb_may_pull(skb, X25_STD_MIN_LEN + 2))
151 goto out_clear; 147 goto out_clear;
152 148
153 x25_write_internal(sk, X25_CLE 149 x25_write_internal(sk, X25_CLEAR_CONFIRMATION);
154 x25_disconnect(sk, ECONNREFUSE 150 x25_disconnect(sk, ECONNREFUSED, skb->data[3], skb->data[4]);
155 break; 151 break;
156 152
157 default: 153 default:
158 break; 154 break;
159 } 155 }
160 156
161 return 0; 157 return 0;
162 158
163 out_clear: 159 out_clear:
164 x25_write_internal(sk, X25_CLEAR_REQUE 160 x25_write_internal(sk, X25_CLEAR_REQUEST);
165 x25->state = X25_STATE_2; 161 x25->state = X25_STATE_2;
166 x25_start_t23timer(sk); 162 x25_start_t23timer(sk);
167 return 0; 163 return 0;
168 } 164 }
169 165
170 /* 166 /*
171 * State machine for state 2, Awaiting Clear C 167 * State machine for state 2, Awaiting Clear Confirmation State.
172 * The handling of the timer(s) is in file x25 168 * The handling of the timer(s) is in file x25_timer.c
173 * Handling of state 0 and connection release 169 * Handling of state 0 and connection release is in af_x25.c.
174 */ 170 */
175 static int x25_state2_machine(struct sock *sk, 171 static int x25_state2_machine(struct sock *sk, struct sk_buff *skb, int frametype)
176 { 172 {
177 switch (frametype) { 173 switch (frametype) {
178 174
179 case X25_CLEAR_REQUEST: 175 case X25_CLEAR_REQUEST:
180 if (!pskb_may_pull(skb 176 if (!pskb_may_pull(skb, X25_STD_MIN_LEN + 2))
181 goto out_clear 177 goto out_clear;
182 178
183 x25_write_internal(sk, 179 x25_write_internal(sk, X25_CLEAR_CONFIRMATION);
184 x25_disconnect(sk, 0, 180 x25_disconnect(sk, 0, skb->data[3], skb->data[4]);
185 break; 181 break;
186 182
187 case X25_CLEAR_CONFIRMATION: 183 case X25_CLEAR_CONFIRMATION:
188 x25_disconnect(sk, 0, 184 x25_disconnect(sk, 0, 0, 0);
189 break; 185 break;
190 186
191 default: 187 default:
192 break; 188 break;
193 } 189 }
194 190
195 return 0; 191 return 0;
196 192
197 out_clear: 193 out_clear:
198 x25_write_internal(sk, X25_CLEAR_REQUE 194 x25_write_internal(sk, X25_CLEAR_REQUEST);
199 x25_start_t23timer(sk); 195 x25_start_t23timer(sk);
200 return 0; 196 return 0;
201 } 197 }
202 198
203 /* 199 /*
204 * State machine for state 3, Connected State. 200 * State machine for state 3, Connected State.
205 * The handling of the timer(s) is in file x25 201 * The handling of the timer(s) is in file x25_timer.c
206 * Handling of state 0 and connection release 202 * Handling of state 0 and connection release is in af_x25.c.
207 */ 203 */
208 static int x25_state3_machine(struct sock *sk, 204 static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype, int ns, int nr, int q, int d, int m)
209 { 205 {
210 int queued = 0; 206 int queued = 0;
211 int modulus; 207 int modulus;
212 struct x25_sock *x25 = x25_sk(sk); 208 struct x25_sock *x25 = x25_sk(sk);
213 209
214 modulus = (x25->neighbour->extended) ? 210 modulus = (x25->neighbour->extended) ? X25_EMODULUS : X25_SMODULUS;
215 211
216 switch (frametype) { 212 switch (frametype) {
217 213
218 case X25_RESET_REQUEST: 214 case X25_RESET_REQUEST:
219 x25_write_internal(sk, 215 x25_write_internal(sk, X25_RESET_CONFIRMATION);
220 x25_stop_timer(sk); 216 x25_stop_timer(sk);
221 x25->condition = 0x00; 217 x25->condition = 0x00;
222 x25->vs = 0; 218 x25->vs = 0;
223 x25->vr = 0; 219 x25->vr = 0;
224 x25->va = 0; 220 x25->va = 0;
225 x25->vl = 0; 221 x25->vl = 0;
226 x25_requeue_frames(sk) 222 x25_requeue_frames(sk);
227 break; 223 break;
228 224
229 case X25_CLEAR_REQUEST: 225 case X25_CLEAR_REQUEST:
230 if (!pskb_may_pull(skb 226 if (!pskb_may_pull(skb, X25_STD_MIN_LEN + 2))
231 goto out_clear 227 goto out_clear;
232 228
233 x25_write_internal(sk, 229 x25_write_internal(sk, X25_CLEAR_CONFIRMATION);
234 x25_disconnect(sk, 0, 230 x25_disconnect(sk, 0, skb->data[3], skb->data[4]);
235 break; 231 break;
236 232
237 case X25_RR: 233 case X25_RR:
238 case X25_RNR: 234 case X25_RNR:
239 if (!x25_validate_nr(s 235 if (!x25_validate_nr(sk, nr)) {
240 x25_clear_queu 236 x25_clear_queues(sk);
241 x25_write_inte 237 x25_write_internal(sk, X25_RESET_REQUEST);
242 x25_start_t22t 238 x25_start_t22timer(sk);
243 x25->condition 239 x25->condition = 0x00;
244 x25->vs 240 x25->vs = 0;
245 x25->vr 241 x25->vr = 0;
246 x25->va 242 x25->va = 0;
247 x25->vl 243 x25->vl = 0;
248 x25->state 244 x25->state = X25_STATE_4;
249 } else { 245 } else {
250 x25_frames_ack 246 x25_frames_acked(sk, nr);
251 if (frametype 247 if (frametype == X25_RNR) {
252 x25->c 248 x25->condition |= X25_COND_PEER_RX_BUSY;
253 } else { 249 } else {
254 x25->c 250 x25->condition &= ~X25_COND_PEER_RX_BUSY;
255 } 251 }
256 } 252 }
257 break; 253 break;
258 254
259 case X25_DATA: /* XXX */ 255 case X25_DATA: /* XXX */
260 x25->condition &= ~X25 256 x25->condition &= ~X25_COND_PEER_RX_BUSY;
261 if ((ns != x25->vr) || 257 if ((ns != x25->vr) || !x25_validate_nr(sk, nr)) {
262 x25_clear_queu 258 x25_clear_queues(sk);
263 x25_write_inte 259 x25_write_internal(sk, X25_RESET_REQUEST);
264 x25_start_t22t 260 x25_start_t22timer(sk);
265 x25->condition 261 x25->condition = 0x00;
266 x25->vs 262 x25->vs = 0;
267 x25->vr 263 x25->vr = 0;
268 x25->va 264 x25->va = 0;
269 x25->vl 265 x25->vl = 0;
270 x25->state 266 x25->state = X25_STATE_4;
271 break; 267 break;
272 } 268 }
273 x25_frames_acked(sk, n 269 x25_frames_acked(sk, nr);
274 if (ns == x25->vr) { 270 if (ns == x25->vr) {
275 if (x25_queue_ 271 if (x25_queue_rx_frame(sk, skb, m) == 0) {
276 x25->v 272 x25->vr = (x25->vr + 1) % modulus;
277 queued 273 queued = 1;
278 } else { 274 } else {
279 /* Sho 275 /* Should never happen */
280 x25_cl 276 x25_clear_queues(sk);
281 x25_wr 277 x25_write_internal(sk, X25_RESET_REQUEST);
282 x25_st 278 x25_start_t22timer(sk);
283 x25->c 279 x25->condition = 0x00;
284 x25->v 280 x25->vs = 0;
285 x25->v 281 x25->vr = 0;
286 x25->v 282 x25->va = 0;
287 x25->v 283 x25->vl = 0;
288 x25->s 284 x25->state = X25_STATE_4;
289 break; 285 break;
290 } 286 }
291 if (atomic_rea 287 if (atomic_read(&sk->sk_rmem_alloc) >
292 (sk->sk_rc 288 (sk->sk_rcvbuf >> 1))
293 x25->c 289 x25->condition |= X25_COND_OWN_RX_BUSY;
294 } 290 }
295 /* 291 /*
296 * If the window 292 * If the window is full Ack it immediately, else
297 * start the hold 293 * start the holdback timer.
298 */ 294 */
299 if (((x25->vl + x25->f 295 if (((x25->vl + x25->facilities.winsize_in) % modulus) == x25->vr) {
300 x25->condition 296 x25->condition &= ~X25_COND_ACK_PENDING;
301 x25_stop_timer 297 x25_stop_timer(sk);
302 x25_enquiry_re 298 x25_enquiry_response(sk);
303 } else { 299 } else {
304 x25->condition 300 x25->condition |= X25_COND_ACK_PENDING;
305 x25_start_t2ti 301 x25_start_t2timer(sk);
306 } 302 }
307 break; 303 break;
308 304
309 case X25_INTERRUPT_CONFIRMATIO 305 case X25_INTERRUPT_CONFIRMATION:
310 clear_bit(X25_INTERRUP 306 clear_bit(X25_INTERRUPT_FLAG, &x25->flags);
311 break; 307 break;
312 308
313 case X25_INTERRUPT: 309 case X25_INTERRUPT:
314 if (sock_flag(sk, SOCK 310 if (sock_flag(sk, SOCK_URGINLINE))
315 queued = !sock 311 queued = !sock_queue_rcv_skb(sk, skb);
316 else { 312 else {
317 skb_set_owner_ 313 skb_set_owner_r(skb, sk);
318 skb_queue_tail 314 skb_queue_tail(&x25->interrupt_in_queue, skb);
319 queued = 1; 315 queued = 1;
320 } 316 }
321 sk_send_sigurg(sk); 317 sk_send_sigurg(sk);
322 x25_write_internal(sk, 318 x25_write_internal(sk, X25_INTERRUPT_CONFIRMATION);
323 break; 319 break;
324 320
325 default: 321 default:
326 pr_warn("unknown %02X 322 pr_warn("unknown %02X in state 3\n", frametype);
327 break; 323 break;
328 } 324 }
329 325
330 return queued; 326 return queued;
331 327
332 out_clear: 328 out_clear:
333 x25_write_internal(sk, X25_CLEAR_REQUE 329 x25_write_internal(sk, X25_CLEAR_REQUEST);
334 x25->state = X25_STATE_2; 330 x25->state = X25_STATE_2;
335 x25_start_t23timer(sk); 331 x25_start_t23timer(sk);
336 return 0; 332 return 0;
337 } 333 }
338 334
339 /* 335 /*
340 * State machine for state 4, Awaiting Reset C 336 * State machine for state 4, Awaiting Reset Confirmation State.
341 * The handling of the timer(s) is in file x25 337 * The handling of the timer(s) is in file x25_timer.c
342 * Handling of state 0 and connection release 338 * Handling of state 0 and connection release is in af_x25.c.
343 */ 339 */
344 static int x25_state4_machine(struct sock *sk, 340 static int x25_state4_machine(struct sock *sk, struct sk_buff *skb, int frametype)
345 { 341 {
346 struct x25_sock *x25 = x25_sk(sk); 342 struct x25_sock *x25 = x25_sk(sk);
347 343
348 switch (frametype) { 344 switch (frametype) {
349 345
350 case X25_RESET_REQUEST: 346 case X25_RESET_REQUEST:
351 x25_write_internal(sk, 347 x25_write_internal(sk, X25_RESET_CONFIRMATION);
352 fallthrough; <<
353 case X25_RESET_CONFIRMATION: { 348 case X25_RESET_CONFIRMATION: {
354 x25_stop_timer(sk); 349 x25_stop_timer(sk);
355 x25->condition = 0x00; 350 x25->condition = 0x00;
356 x25->va = 0; 351 x25->va = 0;
357 x25->vr = 0; 352 x25->vr = 0;
358 x25->vs = 0; 353 x25->vs = 0;
359 x25->vl = 0; 354 x25->vl = 0;
360 x25->state = X25_S 355 x25->state = X25_STATE_3;
361 x25_requeue_frames(sk) 356 x25_requeue_frames(sk);
362 break; 357 break;
363 } 358 }
364 case X25_CLEAR_REQUEST: 359 case X25_CLEAR_REQUEST:
365 if (!pskb_may_pull(skb 360 if (!pskb_may_pull(skb, X25_STD_MIN_LEN + 2))
366 goto out_clear 361 goto out_clear;
367 362
368 x25_write_internal(sk, 363 x25_write_internal(sk, X25_CLEAR_CONFIRMATION);
369 x25_disconnect(sk, 0, 364 x25_disconnect(sk, 0, skb->data[3], skb->data[4]);
370 break; 365 break;
371 366
372 default: 367 default:
373 break; 368 break;
374 } 369 }
375 370
376 return 0; 371 return 0;
377 372
378 out_clear: 373 out_clear:
379 x25_write_internal(sk, X25_CLEAR_REQUE 374 x25_write_internal(sk, X25_CLEAR_REQUEST);
380 x25->state = X25_STATE_2; 375 x25->state = X25_STATE_2;
381 x25_start_t23timer(sk); 376 x25_start_t23timer(sk);
382 return 0; 377 return 0;
383 } 378 }
384 379
385 /* <<
386 * State machine for state 5, Call Accepted / <<
387 * The handling of the timer(s) is in file x25 <<
388 * Handling of state 0 and connection release <<
389 */ <<
390 static int x25_state5_machine(struct sock *sk, <<
391 { <<
392 struct x25_sock *x25 = x25_sk(sk); <<
393 <<
394 switch (frametype) { <<
395 case X25_CLEAR_REQUEST: <<
396 if (!pskb_may_pull(skb <<
397 x25_write_inte <<
398 x25->state = X <<
399 x25_start_t23t <<
400 return 0; <<
401 } <<
402 <<
403 x25_write_internal(sk, <<
404 x25_disconnect(sk, 0, <<
405 break; <<
406 <<
407 default: <<
408 break; <<
409 } <<
410 <<
411 return 0; <<
412 } <<
413 <<
414 /* Higher level upcall for a LAPB frame */ 380 /* Higher level upcall for a LAPB frame */
415 int x25_process_rx_frame(struct sock *sk, stru 381 int x25_process_rx_frame(struct sock *sk, struct sk_buff *skb)
416 { 382 {
417 struct x25_sock *x25 = x25_sk(sk); 383 struct x25_sock *x25 = x25_sk(sk);
418 int queued = 0, frametype, ns, nr, q, 384 int queued = 0, frametype, ns, nr, q, d, m;
419 385
420 if (x25->state == X25_STATE_0) 386 if (x25->state == X25_STATE_0)
421 return 0; 387 return 0;
422 388
423 frametype = x25_decode(sk, skb, &ns, & 389 frametype = x25_decode(sk, skb, &ns, &nr, &q, &d, &m);
424 390
425 switch (x25->state) { 391 switch (x25->state) {
426 case X25_STATE_1: 392 case X25_STATE_1:
427 queued = x25_state1_machine(sk 393 queued = x25_state1_machine(sk, skb, frametype);
428 break; 394 break;
429 case X25_STATE_2: 395 case X25_STATE_2:
430 queued = x25_state2_machine(sk 396 queued = x25_state2_machine(sk, skb, frametype);
431 break; 397 break;
432 case X25_STATE_3: 398 case X25_STATE_3:
433 queued = x25_state3_machine(sk 399 queued = x25_state3_machine(sk, skb, frametype, ns, nr, q, d, m);
434 break; 400 break;
435 case X25_STATE_4: 401 case X25_STATE_4:
436 queued = x25_state4_machine(sk 402 queued = x25_state4_machine(sk, skb, frametype);
437 break; <<
438 case X25_STATE_5: <<
439 queued = x25_state5_machine(sk <<
440 break; 403 break;
441 } 404 }
442 405
443 x25_kick(sk); 406 x25_kick(sk);
444 407
445 return queued; 408 return queued;
446 } 409 }
447 410
448 int x25_backlog_rcv(struct sock *sk, struct sk 411 int x25_backlog_rcv(struct sock *sk, struct sk_buff *skb)
449 { 412 {
450 int queued = x25_process_rx_frame(sk, 413 int queued = x25_process_rx_frame(sk, skb);
451 414
452 if (!queued) 415 if (!queued)
453 kfree_skb(skb); 416 kfree_skb(skb);
454 417
455 return 0; 418 return 0;
456 } 419 }
457 420
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.