diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /include/net/mac80211.h | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index a7044958c75f..3a204acad901 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -557,6 +557,15 @@ enum ieee80211_key_alg { | |||
| 557 | ALG_CCMP, | 557 | ALG_CCMP, |
| 558 | }; | 558 | }; |
| 559 | 559 | ||
| 560 | /** | ||
| 561 | * enum ieee80211_key_len - key length | ||
| 562 | * @WEP40: WEP 5 byte long key | ||
| 563 | * @WEP104: WEP 13 byte long key | ||
| 564 | */ | ||
| 565 | enum ieee80211_key_len { | ||
| 566 | LEN_WEP40 = 5, | ||
| 567 | LEN_WEP104 = 13, | ||
| 568 | }; | ||
| 560 | 569 | ||
| 561 | /** | 570 | /** |
| 562 | * enum ieee80211_key_flags - key flags | 571 | * enum ieee80211_key_flags - key flags |