diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-28 13:47:53 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-28 13:47:53 -0400 |
| commit | de03309bd209b6fb025e9359266e0cbb441f7441 (patch) | |
| tree | 043d6e7b97a2febe412b40aa253baa2a1be3e3f1 /drivers/net/wireless/ath/ath.h | |
| parent | a969dd139cc2f2bccdcb11894f0695517cf84d4d (diff) | |
| parent | c9015b24b262bc7ea56cfd5d78983a73fb5ebd7d (diff) | |
| download | lwn-de03309bd209b6fb025e9359266e0cbb441f7441.tar.gz lwn-de03309bd209b6fb025e9359266e0cbb441f7441.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 c54b7d37bff1..420d69b2674c 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -143,6 +143,7 @@ struct ath_common { u32 keymax; DECLARE_BITMAP(keymap, ATH_KEYMAX); DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX); + DECLARE_BITMAP(ccmp_keymap, ATH_KEYMAX); enum ath_crypt_caps crypt_caps; unsigned int clockrate; |