patch-2.1.22 linux/net/lapb/lapb_in.c

Next file: linux/net/lapb/lapb_out.c
Previous file: linux/net/lapb/lapb_iface.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.21/linux/net/lapb/lapb_in.c linux/net/lapb/lapb_in.c
@@ -232,7 +232,7 @@
 			printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n", lapb->token, pf);
 			printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n", lapb->token, pf);
 #endif
-			lapb_send_control(lapb, LAPB_UA, pf, C_RESPONSE);
+			lapb_send_control(lapb, LAPB_UA, pf, LAPB_RESPONSE);
 			break;
 
 		case LAPB_UA:
@@ -386,7 +386,7 @@
 				lapb->state = LAPB_STATE_1;
 			}
 			break;
-			
+
 		case LAPB_RR:
 #if LAPB_DEBUG > 1
 			printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n", lapb->token, pf, nr);
@@ -403,7 +403,7 @@
 				lapb->state = LAPB_STATE_1;
 			}
 			break;
-				
+
 		case LAPB_REJ:
 #if LAPB_DEBUG > 1
 			printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n", lapb->token, pf, nr);
@@ -422,13 +422,11 @@
 				lapb->state = LAPB_STATE_1;
 			}
 			break;
-			
+
 		case LAPB_I:
 #if LAPB_DEBUG > 1
 			printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n", lapb->token, pf, ns, nr);
 #endif
-			if (type != LAPB_COMMAND)
-				break;
 			if (!lapb_validate_nr(lapb, nr)) {
 #if LAPB_DEBUG > 0
 				printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", lapb->token);
@@ -613,7 +611,7 @@
 				lapb->state = LAPB_STATE_1;
 			}
 			break;
-			
+
 		case LAPB_RR:
 #if LAPB_DEBUG > 1
 			printk(KERN_DEBUG "lapb: (%p) S4 RX RR(%d) R%d\n", lapb->token, pf, nr);
@@ -700,8 +698,6 @@
 #if LAPB_DEBUG > 1
 			printk(KERN_DEBUG "lapb: (%p) S4 RX I(%d) S%d R%d\n", lapb->token, pf, ns, nr);
 #endif
-			if (type != LAPB_COMMAND)
-				break;
 			if (!lapb_validate_nr(lapb, nr)) {
 #if LAPB_DEBUG > 0
 				printk(KERN_DEBUG "lapb: (%p) S4 -> S1\n", lapb->token);
@@ -737,7 +733,7 @@
 				}
 			}
 			break;
-		
+
 		case LAPB_FRMR:
 		case LAPB_ILLEGAL:
 #if LAPB_DEBUG > 1
@@ -765,7 +761,7 @@
 {
 	int frametype, ns, nr, pf, type;
 	lapb_cb *lapb;
-	
+
 	if ((lapb = lapb_tokentostruct(token)) == NULL)
 		return LAPB_BADTOKEN;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov