---

yaml --- r: 33219 b: refs/heads/master c: 558e10a h: refs/heads/master i: 33217: 2dbe738 33215: d8ddba9 v: v3
git-mirror · Aug 6, 2006 · 15b6b1f · 15b6b1f
1 parent a0e20c5
commit 15b6b1f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d254bcdbf2199d9e2a52dbe4592e79ef3a456096
+refs/heads/master: 558e10a57db10de355ee97712d2b6df49e9b7849
diff --git a/trunk/net/lapb/lapb_iface.c b/trunk/net/lapb/lapb_iface.c
@@ -238,11 +238,13 @@ int lapb_setparms(struct net_device *dev, struct lapb_parms_struct *parms)
 		goto out_put;
 
 	if (lapb->state == LAPB_STATE_0) {
-		if (((parms->mode & LAPB_EXTENDED) &&
-		     (parms->window < 1 || parms->window > 127)) ||
-		    (parms->window < 1 || parms->window > 7))
-			goto out_put;
-
+		if (parms->mode & LAPB_EXTENDED) {
+			if (parms->window < 1 || parms->window > 127)
+				goto out_put;
+		} else {
+			if (parms->window < 1 || parms->window > 7)
+				goto out_put;
+		}
 		lapb->mode    = parms->mode;
 		lapb->window  = parms->window;
 	}