Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 fcb261f3 编写于 作者: J Joe Perches 提交者： David S. Miller
浏览文件
操作

lapb: Reduce switch/case indent 

Make the case labels the same indent as the switch.

git diff -w shows 80 column reflowing.
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 207ec0ab
隐藏空白更改
内联 并排
Showing with 444 addition and 467 deletion
net/lapb/lapb_iface.c
浏览文件 @ fcb261f3
...@@ -300,26 +300,26 @@ int lapb_disconnect_request(struct net_device *dev) ...@@ -300,26 +300,26 @@ int lapb_disconnect_request(struct net_device *dev)
goto out; goto out;
switch (lapb->state) { switch (lapb->state) {
case LAPB_STATE_0: case LAPB_STATE_0:
rc = LAPB_NOTCONNECTED; rc = LAPB_NOTCONNECTED;
goto out_put; goto out_put;
case LAPB_STATE_1: case LAPB_STATE_1:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev); printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev); printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
rc = LAPB_NOTCONNECTED; rc = LAPB_NOTCONNECTED;
goto out_put; goto out_put;
case LAPB_STATE_2: case LAPB_STATE_2:
rc = LAPB_OK; rc = LAPB_OK;
goto out_put; goto out_put;
} }
lapb_clear_queues(lapb); lapb_clear_queues(lapb);
......
net/lapb/lapb_in.c
浏览文件 @ fcb261f3
...@@ -44,89 +44,86 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb, ...@@ -44,89 +44,86 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb,
struct lapb_frame *frame) struct lapb_frame *frame)
{ {
switch (frame->type) { switch (frame->type) {
case LAPB_SABM: case LAPB_SABM:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S0 RX SABM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 RX SABM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_3; lapb->state = LAPB_STATE_3;
lapb->condition = 0x00; lapb->condition = 0x00;
lapb->n2count = 0; lapb->n2count = 0;
lapb->vs = 0; lapb->vs = 0;
lapb->vr = 0; lapb->vr = 0;
lapb->va = 0; lapb->va = 0;
lapb_connect_indication(lapb, LAPB_OK); lapb_connect_indication(lapb, LAPB_OK);
} }
break; break;
case LAPB_SABME: case LAPB_SABME:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S0 RX SABME(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 RX SABME(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_3; lapb->state = LAPB_STATE_3;
lapb->condition = 0x00; lapb->condition = 0x00;
lapb->n2count = 0; lapb->n2count = 0;
lapb->vs = 0; lapb->vs = 0;
lapb->vr = 0; lapb->vr = 0;
lapb->va = 0; lapb->va = 0;
lapb_connect_indication(lapb, LAPB_OK); lapb_connect_indication(lapb, LAPB_OK);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} }
break; break;
case LAPB_DISC: case LAPB_DISC:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S0 RX DISC(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 RX DISC(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
LAPB_RESPONSE); break;
break;
default: default:
break; break;
} }
kfree_skb(skb); kfree_skb(skb);
...@@ -140,100 +137,97 @@ static void lapb_state1_machine(struct lapb_cb *lapb, struct sk_buff *skb, ...@@ -140,100 +137,97 @@ static void lapb_state1_machine(struct lapb_cb *lapb, struct sk_buff *skb,
struct lapb_frame *frame) struct lapb_frame *frame)
{ {
switch (frame->type) { switch (frame->type) {
case LAPB_SABM: case LAPB_SABM:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 RX SABM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 RX SABM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif
lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE);
} else {
#if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n",
lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} } else {
break;
case LAPB_SABME:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 RX SABME(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE);
}
break;
case LAPB_SABME:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 RX SABME(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, if (lapb->mode & LAPB_EXTENDED) {
LAPB_RESPONSE);
} else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} } else {
break;
case LAPB_DISC:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 RX DISC(%d)\n",
lapb->dev, frame->pf);
printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
break; }
break;
case LAPB_UA: case LAPB_DISC:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 RX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 RX DISC(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
lapb->dev, frame->pf);
#endif #endif
if (frame->pf) { lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE);
#if LAPB_DEBUG > 0 break;
printk(KERN_DEBUG "lapb: (%p) S1 -> S3\n",
lapb->dev);
#endif
lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_3;
lapb->condition = 0x00;
lapb->n2count = 0;
lapb->vs = 0;
lapb->vr = 0;
lapb->va = 0;
lapb_connect_confirmation(lapb, LAPB_OK);
}
break;
case LAPB_DM: case LAPB_UA:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 RX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S1 RX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (frame->pf) { if (frame->pf) {
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", printk(KERN_DEBUG "lapb: (%p) S1 -> S3\n", lapb->dev);
lapb->dev); #endif
#endif lapb_stop_t1timer(lapb);
lapb_clear_queues(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_3;
lapb_start_t1timer(lapb); lapb->condition = 0x00;
lapb_stop_t2timer(lapb); lapb->n2count = 0;
lapb_disconnect_indication(lapb, LAPB_REFUSED); lapb->vs = 0;
} lapb->vr = 0;
break; lapb->va = 0;
lapb_connect_confirmation(lapb, LAPB_OK);
}
break;
case LAPB_DM:
#if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 RX DM(%d)\n",
lapb->dev, frame->pf);
#endif
if (frame->pf) {
#if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
#endif
lapb_clear_queues(lapb);
lapb->state = LAPB_STATE_0;
lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb);
lapb_disconnect_indication(lapb, LAPB_REFUSED);
}
break;
} }
kfree_skb(skb); kfree_skb(skb);
...@@ -247,78 +241,73 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb, ...@@ -247,78 +241,73 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb,
struct lapb_frame *frame) struct lapb_frame *frame)
{ {
switch (frame->type) { switch (frame->type) {
case LAPB_SABM: case LAPB_SABM:
case LAPB_SABME: case LAPB_SABME:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S2 RX {SABM,SABME}(%d)\n", printk(KERN_DEBUG "lapb: (%p) S2 RX {SABM,SABME}(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
printk(KERN_DEBUG "lapb: (%p) S2 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S2 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE);
LAPB_RESPONSE); break;
break;
case LAPB_DISC: case LAPB_DISC:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n", printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
LAPB_RESPONSE); break;
break;
case LAPB_UA: case LAPB_UA:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S2 RX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S2 RX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (frame->pf) { if (frame->pf) {
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
lapb->dev);
#endif #endif
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb_disconnect_confirmation(lapb, LAPB_OK); lapb_disconnect_confirmation(lapb, LAPB_OK);
} }
break; break;
case LAPB_DM: case LAPB_DM:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (frame->pf) { if (frame->pf) {
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
lapb->dev); #endif
#endif lapb->state = LAPB_STATE_0;
lapb->state = LAPB_STATE_0; lapb_start_t1timer(lapb);
lapb_start_t1timer(lapb); lapb_stop_t2timer(lapb);
lapb_stop_t2timer(lapb); lapb_disconnect_confirmation(lapb, LAPB_NOTCONNECTED);
lapb_disconnect_confirmation(lapb, }
LAPB_NOTCONNECTED); break;
}
break;
case LAPB_I: case LAPB_I:
case LAPB_REJ: case LAPB_REJ:
case LAPB_RNR: case LAPB_RNR:
case LAPB_RR: case LAPB_RR:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S2 RX {I,REJ,RNR,RR}" printk(KERN_DEBUG "lapb: (%p) S2 RX {I,REJ,RNR,RR}(%d)\n",
"(%d)\n", lapb->dev, frame->pf); lapb->dev, frame->pf);
printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (frame->pf) if (frame->pf)
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
break; break;
} }
kfree_skb(skb); kfree_skb(skb);
...@@ -336,277 +325,267 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb, ...@@ -336,277 +325,267 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
LAPB_SMODULUS; LAPB_SMODULUS;
switch (frame->type) { switch (frame->type) {
case LAPB_SABM: case LAPB_SABM:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX SABM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 RX SABM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->condition = 0x00; lapb->condition = 0x00;
lapb->n2count = 0; lapb->n2count = 0;
lapb->vs = 0; lapb->vs = 0;
lapb->vr = 0; lapb->vr = 0;
lapb->va = 0; lapb->va = 0;
lapb_requeue_frames(lapb); lapb_requeue_frames(lapb);
} }
break; break;
case LAPB_SABME: case LAPB_SABME:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX SABME(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 RX SABME(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->condition = 0x00; lapb->condition = 0x00;
lapb->n2count = 0; lapb->n2count = 0;
lapb->vs = 0; lapb->vs = 0;
lapb->vr = 0; lapb->vr = 0;
lapb->va = 0; lapb->va = 0;
lapb_requeue_frames(lapb); lapb_requeue_frames(lapb);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} }
break; break;
case LAPB_DISC: case LAPB_DISC:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX DISC(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 RX DISC(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_clear_queues(lapb); lapb_clear_queues(lapb);
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
LAPB_RESPONSE); lapb_start_t1timer(lapb);
lapb_start_t1timer(lapb); lapb_stop_t2timer(lapb);
lapb_stop_t2timer(lapb); lapb->state = LAPB_STATE_0;
lapb->state = LAPB_STATE_0; lapb_disconnect_indication(lapb, LAPB_OK);
lapb_disconnect_indication(lapb, LAPB_OK); break;
break;
case LAPB_DM: case LAPB_DM:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 RX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_clear_queues(lapb); lapb_clear_queues(lapb);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb_disconnect_indication(lapb, LAPB_NOTCONNECTED); lapb_disconnect_indication(lapb, LAPB_NOTCONNECTED);
break; break;
case LAPB_RNR: case LAPB_RNR:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX RNR(%d) R%d\n", printk(KERN_DEBUG "lapb: (%p) S3 RX RNR(%d) R%d\n",
lapb->dev, frame->pf, frame->nr); lapb->dev, frame->pf, frame->nr);
#endif #endif
lapb->condition |= LAPB_PEER_RX_BUSY_CONDITION; lapb->condition |= LAPB_PEER_RX_BUSY_CONDITION;
lapb_check_need_response(lapb, frame->cr, frame->pf); lapb_check_need_response(lapb, frame->cr, frame->pf);
if (lapb_validate_nr(lapb, frame->nr)) { if (lapb_validate_nr(lapb, frame->nr)) {
lapb_check_iframes_acked(lapb, frame->nr); lapb_check_iframes_acked(lapb, frame->nr);
} else { } else {
lapb->frmr_data = *frame; lapb->frmr_data = *frame;
lapb->frmr_type = LAPB_FRMR_Z; lapb->frmr_type = LAPB_FRMR_Z;
lapb_transmit_frmr(lapb); lapb_transmit_frmr(lapb);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_4; lapb->state = LAPB_STATE_4;
lapb->n2count = 0; lapb->n2count = 0;
} }
break; break;
case LAPB_RR: case LAPB_RR:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n", printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n",
lapb->dev, frame->pf, frame->nr); lapb->dev, frame->pf, frame->nr);
#endif #endif
lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION;
lapb_check_need_response(lapb, frame->cr, frame->pf); lapb_check_need_response(lapb, frame->cr, frame->pf);
if (lapb_validate_nr(lapb, frame->nr)) { if (lapb_validate_nr(lapb, frame->nr)) {
lapb_check_iframes_acked(lapb, frame->nr); lapb_check_iframes_acked(lapb, frame->nr);
} else { } else {
lapb->frmr_data = *frame; lapb->frmr_data = *frame;
lapb->frmr_type = LAPB_FRMR_Z; lapb->frmr_type = LAPB_FRMR_Z;
lapb_transmit_frmr(lapb); lapb_transmit_frmr(lapb);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_4; lapb->state = LAPB_STATE_4;
lapb->n2count = 0; lapb->n2count = 0;
} }
break; break;
case LAPB_REJ: case LAPB_REJ:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n", printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n",
lapb->dev, frame->pf, frame->nr); lapb->dev, frame->pf, frame->nr);
#endif #endif
lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION;
lapb_check_need_response(lapb, frame->cr, frame->pf); lapb_check_need_response(lapb, frame->cr, frame->pf);
if (lapb_validate_nr(lapb, frame->nr)) { if (lapb_validate_nr(lapb, frame->nr)) {
lapb_frames_acked(lapb, frame->nr); lapb_frames_acked(lapb, frame->nr);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb->n2count = 0; lapb->n2count = 0;
lapb_requeue_frames(lapb); lapb_requeue_frames(lapb);
} else { } else {
lapb->frmr_data = *frame; lapb->frmr_data = *frame;
lapb->frmr_type = LAPB_FRMR_Z; lapb->frmr_type = LAPB_FRMR_Z;
lapb_transmit_frmr(lapb); lapb_transmit_frmr(lapb);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_4; lapb->state = LAPB_STATE_4;
lapb->n2count = 0; lapb->n2count = 0;
} }
break; break;
case LAPB_I: case LAPB_I:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n", printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n",
lapb->dev, frame->pf, frame->ns, frame->nr); lapb->dev, frame->pf, frame->ns, frame->nr);
#endif #endif
if (!lapb_validate_nr(lapb, frame->nr)) { if (!lapb_validate_nr(lapb, frame->nr)) {
lapb->frmr_data = *frame; lapb->frmr_data = *frame;
lapb->frmr_type = LAPB_FRMR_Z; lapb->frmr_type = LAPB_FRMR_Z;
lapb_transmit_frmr(lapb); lapb_transmit_frmr(lapb);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_4; lapb->state = LAPB_STATE_4;
lapb->n2count = 0; lapb->n2count = 0;
break;
}
if (lapb->condition & LAPB_PEER_RX_BUSY_CONDITION)
lapb_frames_acked(lapb, frame->nr);
else
lapb_check_iframes_acked(lapb, frame->nr);
if (frame->ns == lapb->vr) {
int cn;
cn = lapb_data_indication(lapb, skb);
queued = 1;
/*
* If upper layer has dropped the frame, we
* basically ignore any further protocol
* processing. This will cause the peer
* to re-transmit the frame later like
* a frame lost on the wire.
*/
if (cn == NET_RX_DROP) {
printk(KERN_DEBUG "LAPB: rx congestion\n");
break; break;
} }
if (lapb->condition & LAPB_PEER_RX_BUSY_CONDITION) lapb->vr = (lapb->vr + 1) % modulus;
lapb_frames_acked(lapb, frame->nr); lapb->condition &= ~LAPB_REJECT_CONDITION;
else if (frame->pf)
lapb_check_iframes_acked(lapb, frame->nr); lapb_enquiry_response(lapb);
else {
if (frame->ns == lapb->vr) { if (!(lapb->condition &
int cn; LAPB_ACK_PENDING_CONDITION)) {
cn = lapb_data_indication(lapb, skb); lapb->condition |= LAPB_ACK_PENDING_CONDITION;
queued = 1; lapb_start_t2timer(lapb);
/*
* If upper layer has dropped the frame, we
* basically ignore any further protocol
* processing. This will cause the peer
* to re-transmit the frame later like
* a frame lost on the wire.
*/
if (cn == NET_RX_DROP) {
printk(KERN_DEBUG
"LAPB: rx congestion\n");
break;
} }
lapb->vr = (lapb->vr + 1) % modulus; }
lapb->condition &= ~LAPB_REJECT_CONDITION; } else {
if (lapb->condition & LAPB_REJECT_CONDITION) {
if (frame->pf) if (frame->pf)
lapb_enquiry_response(lapb); lapb_enquiry_response(lapb);
else {
if (!(lapb->condition &
LAPB_ACK_PENDING_CONDITION)) {
lapb->condition |= LAPB_ACK_PENDING_CONDITION;
lapb_start_t2timer(lapb);
}
}
} else { } else {
if (lapb->condition & LAPB_REJECT_CONDITION) { #if LAPB_DEBUG > 1
if (frame->pf) printk(KERN_DEBUG
lapb_enquiry_response(lapb); "lapb: (%p) S3 TX REJ(%d) R%d\n",
} else { lapb->dev, frame->pf, lapb->vr);
#if LAPB_DEBUG > 1 #endif
printk(KERN_DEBUG lapb->condition |= LAPB_REJECT_CONDITION;
"lapb: (%p) S3 TX REJ(%d) R%d\n", lapb_send_control(lapb, LAPB_REJ, frame->pf,
lapb->dev, frame->pf, lapb->vr); LAPB_RESPONSE);
#endif lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
lapb->condition |= LAPB_REJECT_CONDITION;
lapb_send_control(lapb, LAPB_REJ,
frame->pf,
LAPB_RESPONSE);
lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
}
} }
break; }
break;
case LAPB_FRMR: case LAPB_FRMR:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX FRMR(%d) %02X " printk(KERN_DEBUG "lapb: (%p) S3 RX FRMR(%d) %02X "
"%02X %02X %02X %02X\n", lapb->dev, frame->pf, "%02X %02X %02X %02X\n", lapb->dev, frame->pf,
skb->data[0], skb->data[1], skb->data[2], skb->data[0], skb->data[1], skb->data[2],
skb->data[3], skb->data[4]); skb->data[3], skb->data[4]);
#endif #endif
lapb_establish_data_link(lapb); lapb_establish_data_link(lapb);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_requeue_frames(lapb); lapb_requeue_frames(lapb);
lapb->state = LAPB_STATE_1; lapb->state = LAPB_STATE_1;
break; break;
case LAPB_ILLEGAL: case LAPB_ILLEGAL:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 RX ILLEGAL(%d)\n", printk(KERN_DEBUG "lapb: (%p) S3 RX ILLEGAL(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb->frmr_data = *frame; lapb->frmr_data = *frame;
lapb->frmr_type = LAPB_FRMR_W; lapb->frmr_type = LAPB_FRMR_W;
lapb_transmit_frmr(lapb); lapb_transmit_frmr(lapb);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev); printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
#endif #endif
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_4; lapb->state = LAPB_STATE_4;
lapb->n2count = 0; lapb->n2count = 0;
break; break;
} }
if (!queued) if (!queued)
...@@ -621,75 +600,73 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb, ...@@ -621,75 +600,73 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb,
struct lapb_frame *frame) struct lapb_frame *frame)
{ {
switch (frame->type) { switch (frame->type) {
case LAPB_SABM: case LAPB_SABM:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S4 RX SABM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S4 RX SABM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_3; lapb->state = LAPB_STATE_3;
lapb->condition = 0x00; lapb->condition = 0x00;
lapb->n2count = 0; lapb->n2count = 0;
lapb->vs = 0; lapb->vs = 0;
lapb->vr = 0; lapb->vr = 0;
lapb->va = 0; lapb->va = 0;
lapb_connect_indication(lapb, LAPB_OK); lapb_connect_indication(lapb, LAPB_OK);
} }
break; break;
case LAPB_SABME: case LAPB_SABME:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S4 RX SABME(%d)\n", printk(KERN_DEBUG "lapb: (%p) S4 RX SABME(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev);
lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_UA, frame->pf, lapb_send_control(lapb, LAPB_UA, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_3; lapb->state = LAPB_STATE_3;
lapb->condition = 0x00; lapb->condition = 0x00;
lapb->n2count = 0; lapb->n2count = 0;
lapb->vs = 0; lapb->vs = 0;
lapb->vr = 0; lapb->vr = 0;
lapb->va = 0; lapb->va = 0;
lapb_connect_indication(lapb, LAPB_OK); lapb_connect_indication(lapb, LAPB_OK);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n",
lapb->dev, frame->pf); lapb->dev, frame->pf);
#endif #endif
lapb_send_control(lapb, LAPB_DM, frame->pf, lapb_send_control(lapb, LAPB_DM, frame->pf,
LAPB_RESPONSE); LAPB_RESPONSE);
} }
break; break;
} }
kfree_skb(skb); kfree_skb(skb);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或