diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/wireless/orinoco | |
| parent | 0625491493d9000e4556bf566d205c28c8e7dc4e (diff) | |
| parent | 2fbd3da3877ad8d923b055e5996f80b4d4a6daf4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/wireless/orinoco')
| -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 40d8dfa7eace..359652d35e63 100644 --- a/drivers/net/wireless/orinoco/hw.c +++ b/drivers/net/wireless/orinoco/hw.c | |||
| @@ -644,7 +644,7 @@ int orinoco_hw_get_tkip_iv(struct orinoco_private *priv, int key, u8 *tsc) | |||
| 644 | int err = 0; | 644 | int err = 0; |
| 645 | u8 tsc_arr[4][ORINOCO_SEQ_LEN]; | 645 | u8 tsc_arr[4][ORINOCO_SEQ_LEN]; |
| 646 | 646 | ||
| 647 | if ((key < 0) || (key > 4)) | 647 | if ((key < 0) || (key >= 4)) |
| 648 | return -EINVAL; | 648 | return -EINVAL; |
| 649 | 649 | ||
| 650 | err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_TKIP_IV, | 650 | err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_TKIP_IV, |