diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
| commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
| tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /net/lapb/lapb_iface.c | |
| parent | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
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) | |||
| 238 | goto out_put; | 238 | goto out_put; |
| 239 | 239 | ||
| 240 | if (lapb->state == LAPB_STATE_0) { | 240 | if (lapb->state == LAPB_STATE_0) { |
| 241 | if (((parms->mode & LAPB_EXTENDED) && | 241 | if (parms->mode & LAPB_EXTENDED) { |
| 242 | (parms->window < 1 || parms->window > 127)) || | 242 | if (parms->window < 1 || parms->window > 127) |
| 243 | (parms->window < 1 || parms->window > 7)) | 243 | goto out_put; |
| 244 | goto out_put; | 244 | } else { |
| 245 | 245 | if (parms->window < 1 || parms->window > 7) | |
| 246 | goto out_put; | ||
| 247 | } | ||
| 246 | lapb->mode = parms->mode; | 248 | lapb->mode = parms->mode; |
| 247 | lapb->window = parms->window; | 249 | lapb->window = parms->window; |
| 248 | } | 250 | } |