summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-08-19 03:29:16 +0400
committerDavid S. Miller <davem@davemloft.net>2009-08-19 03:29:16 +0400
commit08fdef99342955a62884fb5c49ab43431a1cafbf (patch)
tree79aa5cdb053ae0b82c6d2b2f61eb5cc81115c8b2 /drivers/net
parentc1a8f1f1c8e01eab5862c8db39b49ace814e6c66 (diff)
parent518ff04fd84290a7ad9042e8a46d78d29cb443d3 (diff)
downloadlinux-08fdef99342955a62884fb5c49ab43431a1cafbf.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/orinoco/hw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index 632fac86a308..b3946272c72e 100644
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -70,7 +70,7 @@ int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key, u8 *tsc)
int err = 0;
u8 tsc_arr[4][IW_ENCODE_SEQ_MAX_SIZE];
- if ((key < 0) || (key > 4))
+ if ((key < 0) || (key >= 4))
return -EINVAL;
err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_TKIP_IV,