diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-02 21:45:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-02 21:45:44 +0200 |
| commit | 7162f6691e9d39d8d866574687cddb3f1ec65d72 (patch) | |
| tree | c511679caf5c825ede4728870c513f92f4f1616b /drivers/net/wireless/ath/ath.h | |
| parent | bna: fix stats handling (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-7162f6691e9d39d8d866574687cddb3f1ec65d72.tar.xz linux-7162f6691e9d39d8d866574687cddb3f1ec65d72.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index d32f2828b098..a706202fa67c 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -119,6 +119,7 @@ struct ath_common { u32 keymax; DECLARE_BITMAP(keymap, ATH_KEYMAX); + DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX); u8 splitmic; struct ath_regulatory regulatory; |