diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
| commit | e9ffb3d7ec94083a44a8721681391beca2ffd68c (patch) | |
| tree | 6768ab487b3f44c2a4995ee61307e47760ca9b88 /net/lapb/lapb_iface.c | |
| parent | 8b9411014e6f18a883c18b38f41338dbd53fddea (diff) | |
| parent | e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 (diff) | |
Merge branch 'from-linus' 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 | } |