diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 08:58:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 08:58:24 -0700 |
| commit | cb3f1e7b835f6fe0fc09574381fe54daf6600001 (patch) | |
| tree | 80db1baa3e59b65a2bb2db833af8eb336459404f /net/lapb/lapb_iface.c | |
| parent | 3e3183bab0257a6d02038658c53b491e1378612f (diff) | |
| parent | 558e10a57db10de355ee97712d2b6df49e9b7849 (diff) | |
| download | kernel-crypto-cb3f1e7b835f6fe0fc09574381fe54daf6600001.tar.gz kernel-crypto-cb3f1e7b835f6fe0fc09574381fe54daf6600001.tar.xz kernel-crypto-cb3f1e7b835f6fe0fc09574381fe54daf6600001.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[LAPB]: Fix windowsize check
[TCP]: Fixes IW > 2 cases when TCP is application limited
[PKT_SCHED] RED: Fix overflow in calculation of queue average
[LLX]: SOCK_DGRAM interface fixes
[PKT_SCHED]: Return ENOENT if qdisc module is unavailable
[BRIDGE]: netlink status fix
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 d504eed416f..7e6bc41eeb2 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; } |