b43: Fix hardware key index handling

This fixes the hardware encryption keys index and array size handling.

Thanks to Gregor Kowski for reporting this issue.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 102094a23598..a1b3b731935b 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -493,6 +493,10 @@ enum {
 
 /* Max size of a security key */
 #define B43_SEC_KEYSIZE                 16
+/* Max number of group keys */
+#define B43_NR_GROUP_KEYS               4
+/* Max number of pairwise keys */
+#define B43_NR_PAIRWISE_KEYS            50
 /* Security algorithms. */
 enum {
         B43_SEC_ALGO_NONE = 0,  /* unencrypted, as of TX header. */
@@ -819,8 +823,7 @@ struct b43_wldev {
 
         /* encryption/decryption */
         u16 ktp;                /* Key table pointer */
-        u8 max_nr_keys;
-        struct b43_key key[58];
+        struct b43_key key[B43_NR_GROUP_KEYS * 2 + B43_NR_PAIRWISE_KEYS];
 
         /* Firmware data */
         struct b43_firmware fw;