diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
| commit | 409ec36c320d580a036045e603f96286c362c609 (patch) | |
| tree | 3dd9b3569799f7962b523a068052445e2d2c51aa /net/mac80211/key.h | |
| parent | 1b7fe59322bef9e7a2c05b64a07a66b875299736 (diff) | |
| parent | 8d5eab5aa676378b4c9daa62d10d08a0bca04677 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/key.h')
| -rw-r--r-- | net/mac80211/key.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/key.h b/net/mac80211/key.h index 8106aa1b7466..4ddbe27eb570 100644 --- a/net/mac80211/key.h +++ b/net/mac80211/key.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #define WEP_IV_LEN 4 | 22 | #define WEP_IV_LEN 4 |
| 23 | #define WEP_ICV_LEN 4 | 23 | #define WEP_ICV_LEN 4 |
| 24 | #define ALG_TKIP_KEY_LEN 32 | ||
| 25 | #define ALG_CCMP_KEY_LEN 16 | 24 | #define ALG_CCMP_KEY_LEN 16 |
| 26 | #define CCMP_HDR_LEN 8 | 25 | #define CCMP_HDR_LEN 8 |
| 27 | #define CCMP_MIC_LEN 8 | 26 | #define CCMP_MIC_LEN 8 |