diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 12:38:41 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 12:38:41 +0200 |
| commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
| tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /net/lapb/lapb_iface.c | |
| parent | Merge branch 'master' into upstream (diff) | |
| parent | Linux v2.6.18-rc4 (diff) | |
| download | linux-242898be7a1921f646ca529ddc26d7337c69922f.tar.xz linux-242898be7a1921f646ca529ddc26d7337c69922f.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/lapb/lapb_iface.c')
| -rw-r--r-- | net/lapb/lapb_iface.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index d504eed416f6..7e6bc41eeb21 100644 --- a/net/lapb/lapb_iface.c +++ b/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; } |