From 9e52ee076efb3860d7579695dbe093e0c1ca624b Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 25 Aug 2009 14:31:11 +0200 Subject: [PATCH] --- yaml --- r: 162473 b: refs/heads/master c: 8f679185a300d89b73ed348ecae361515b97ef59 h: refs/heads/master i: 162471: 1a4db8adc96c6615fb17e0a08fe51ec664b3a4a8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/sta_ioctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4735e2249e5d..20592106567a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49debb5684009d56ec5a0f930e513b1044db5e76 +refs/heads/master: 8f679185a300d89b73ed348ecae361515b97ef59 diff --git a/trunk/drivers/staging/rt2860/sta_ioctl.c b/trunk/drivers/staging/rt2860/sta_ioctl.c index b6cdf13fbfaa..c0e04251e126 100644 --- a/trunk/drivers/staging/rt2860/sta_ioctl.c +++ b/trunk/drivers/staging/rt2860/sta_ioctl.c @@ -1369,8 +1369,8 @@ int rt_ioctl_siwfrag(struct net_device *dev, if (frag->disabled) val = MAX_FRAG_THRESHOLD; - else if (frag->value >= MIN_FRAG_THRESHOLD || frag->value <= MAX_FRAG_THRESHOLD) - val = __cpu_to_le16(frag->value & ~0x1); /* even numbers only */ + else if (frag->value >= MIN_FRAG_THRESHOLD && frag->value <= MAX_FRAG_THRESHOLD) + val = __cpu_to_le16(frag->value & ~0x1); /* even numbers only */ else if (frag->value == 0) val = MAX_FRAG_THRESHOLD; else