diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-19 01:29:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-19 01:29:16 +0200 |
| commit | 08fdef99342955a62884fb5c49ab43431a1cafbf (patch) | |
| tree | 79aa5cdb053ae0b82c6d2b2f61eb5cc81115c8b2 /drivers | |
| parent | net: restore gnet_stats_basic to previous definition (diff) | |
| parent | orinoco: correct key bounds check in orinoco_hw_get_tkip_iv (diff) | |
| download | linux-08fdef99342955a62884fb5c49ab43431a1cafbf.tar.xz linux-08fdef99342955a62884fb5c49ab43431a1cafbf.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/orinoco/hw.c | 2 |
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, |