diff options
-rw-r--r-- | net/lapb/lapb_iface.c | 6 | ||||
-rw-r--r-- | net/lapb/lapb_out.c | 4 | ||||
-rw-r--r-- | net/lapb/lapb_subr.c | 16 | ||||
-rw-r--r-- | net/lapb/lapb_timer.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index 7e6bc41eeb21..a2e7aa63fd8a 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * LAPB 002 Jonathan Naylor New timer architecture. | 14 | * LAPB 002 Jonathan Naylor New timer architecture. |
15 | * 2000-10-29 Henner Eisen lapb_data_indication() return status. | 15 | * 2000-10-29 Henner Eisen lapb_data_indication() return status. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
@@ -43,7 +43,7 @@ static struct list_head lapb_list = LIST_HEAD_INIT(lapb_list); | |||
43 | static DEFINE_RWLOCK(lapb_list_lock); | 43 | static DEFINE_RWLOCK(lapb_list_lock); |
44 | 44 | ||
45 | /* | 45 | /* |
46 | * Free an allocated lapb control block. | 46 | * Free an allocated lapb control block. |
47 | */ | 47 | */ |
48 | static void lapb_free_cb(struct lapb_cb *lapb) | 48 | static void lapb_free_cb(struct lapb_cb *lapb) |
49 | { | 49 | { |
@@ -407,7 +407,7 @@ int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb) | |||
407 | return lapb->callbacks.data_indication(lapb->dev, skb); | 407 | return lapb->callbacks.data_indication(lapb->dev, skb); |
408 | 408 | ||
409 | kfree_skb(skb); | 409 | kfree_skb(skb); |
410 | return NET_RX_CN_HIGH; /* For now; must be != NET_RX_DROP */ | 410 | return NET_RX_CN_HIGH; /* For now; must be != NET_RX_DROP */ |
411 | } | 411 | } |
412 | 412 | ||
413 | int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb) | 413 | int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb) |
diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c index 49a761bd9314..981beb5e5187 100644 --- a/net/lapb/lapb_out.c +++ b/net/lapb/lapb_out.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
35 | #include <net/lapb.h> | 35 | #include <net/lapb.h> |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * This procedure is passed a buffer descriptor for an iframe. It builds | 38 | * This procedure is passed a buffer descriptor for an iframe. It builds |
39 | * the rest of the control part of the frame and then writes it out. | 39 | * the rest of the control part of the frame and then writes it out. |
40 | */ | 40 | */ |
@@ -66,7 +66,7 @@ static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll | |||
66 | lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr); | 66 | lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr); |
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); | 69 | lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); |
70 | } | 70 | } |
71 | 71 | ||
72 | void lapb_kick(struct lapb_cb *lapb) | 72 | void lapb_kick(struct lapb_cb *lapb) |
diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c index 8b5eefd70f03..b8739cf9156d 100644 --- a/net/lapb/lapb_subr.c +++ b/net/lapb/lapb_subr.c | |||
@@ -59,7 +59,7 @@ void lapb_frames_acked(struct lapb_cb *lapb, unsigned short nr) | |||
59 | */ | 59 | */ |
60 | if (lapb->va != nr) | 60 | if (lapb->va != nr) |
61 | while (skb_peek(&lapb->ack_queue) && lapb->va != nr) { | 61 | while (skb_peek(&lapb->ack_queue) && lapb->va != nr) { |
62 | skb = skb_dequeue(&lapb->ack_queue); | 62 | skb = skb_dequeue(&lapb->ack_queue); |
63 | kfree_skb(skb); | 63 | kfree_skb(skb); |
64 | lapb->va = (lapb->va + 1) % modulus; | 64 | lapb->va = (lapb->va + 1) % modulus; |
65 | } | 65 | } |
@@ -67,7 +67,7 @@ void lapb_frames_acked(struct lapb_cb *lapb, unsigned short nr) | |||
67 | 67 | ||
68 | void lapb_requeue_frames(struct lapb_cb *lapb) | 68 | void lapb_requeue_frames(struct lapb_cb *lapb) |
69 | { | 69 | { |
70 | struct sk_buff *skb, *skb_prev = NULL; | 70 | struct sk_buff *skb, *skb_prev = NULL; |
71 | 71 | ||
72 | /* | 72 | /* |
73 | * Requeue all the un-ack-ed frames on the output queue to be picked | 73 | * Requeue all the un-ack-ed frames on the output queue to be picked |
@@ -91,7 +91,7 @@ int lapb_validate_nr(struct lapb_cb *lapb, unsigned short nr) | |||
91 | { | 91 | { |
92 | unsigned short vc = lapb->va; | 92 | unsigned short vc = lapb->va; |
93 | int modulus; | 93 | int modulus; |
94 | 94 | ||
95 | modulus = (lapb->mode & LAPB_EXTENDED) ? LAPB_EMODULUS : LAPB_SMODULUS; | 95 | modulus = (lapb->mode & LAPB_EXTENDED) ? LAPB_EMODULUS : LAPB_SMODULUS; |
96 | 96 | ||
97 | while (vc != lapb->vs) { | 97 | while (vc != lapb->vs) { |
@@ -99,7 +99,7 @@ int lapb_validate_nr(struct lapb_cb *lapb, unsigned short nr) | |||
99 | return 1; | 99 | return 1; |
100 | vc = (vc + 1) % modulus; | 100 | vc = (vc + 1) % modulus; |
101 | } | 101 | } |
102 | 102 | ||
103 | return nr == lapb->vs; | 103 | return nr == lapb->vs; |
104 | } | 104 | } |
105 | 105 | ||
@@ -149,7 +149,7 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb, | |||
149 | frame->cr = LAPB_RESPONSE; | 149 | frame->cr = LAPB_RESPONSE; |
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | skb_pull(skb, 1); | 153 | skb_pull(skb, 1); |
154 | 154 | ||
155 | if (lapb->mode & LAPB_EXTENDED) { | 155 | if (lapb->mode & LAPB_EXTENDED) { |
@@ -220,9 +220,9 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb, | |||
220 | return 0; | 220 | return 0; |
221 | } | 221 | } |
222 | 222 | ||
223 | /* | 223 | /* |
224 | * This routine is called when the HDLC layer internally generates a | 224 | * This routine is called when the HDLC layer internally generates a |
225 | * command or response for the remote machine ( eg. RR, UA etc. ). | 225 | * command or response for the remote machine ( eg. RR, UA etc. ). |
226 | * Only supervisory or unnumbered frames are processed, FRMRs are handled | 226 | * Only supervisory or unnumbered frames are processed, FRMRs are handled |
227 | * by lapb_transmit_frmr below. | 227 | * by lapb_transmit_frmr below. |
228 | */ | 228 | */ |
@@ -259,7 +259,7 @@ void lapb_send_control(struct lapb_cb *lapb, int frametype, | |||
259 | lapb_transmit_buffer(lapb, skb, type); | 259 | lapb_transmit_buffer(lapb, skb, type); |
260 | } | 260 | } |
261 | 261 | ||
262 | /* | 262 | /* |
263 | * This routine generates FRMRs based on information previously stored in | 263 | * This routine generates FRMRs based on information previously stored in |
264 | * the LAPB control block. | 264 | * the LAPB control block. |
265 | */ | 265 | */ |
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 2c8f0f809220..af6d14b44e2e 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c | |||
@@ -101,7 +101,7 @@ static void lapb_t1timer_expiry(unsigned long param) | |||
101 | /* | 101 | /* |
102 | * Awaiting connection state, send SABM(E), up to N2 times. | 102 | * Awaiting connection state, send SABM(E), up to N2 times. |
103 | */ | 103 | */ |
104 | case LAPB_STATE_1: | 104 | case LAPB_STATE_1: |
105 | if (lapb->n2count == lapb->n2) { | 105 | if (lapb->n2count == lapb->n2) { |
106 | lapb_clear_queues(lapb); | 106 | lapb_clear_queues(lapb); |
107 | lapb->state = LAPB_STATE_0; | 107 | lapb->state = LAPB_STATE_0; |