diff options
author | Zhu Yi <yi.zhu@intel.com> | 2009-05-21 09:47:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-22 14:06:02 -0400 |
commit | e31a16d6f64ef0e324c6f54d5112703c3f13a9c4 (patch) | |
tree | 4ed30d0ebd1d948aaa14bcd4fb52f29d9bb2e7a8 /include/net/mac80211.h | |
parent | a971be223f243311a8014ddfc721f68e3ef2da9c (diff) |
wireless: move some utility functions from mac80211 to cfg80211
The patch moves some utility functions from mac80211 to cfg80211.
Because these functions are doing generic 802.11 operations so they
are not mac80211 specific. The moving allows some fullmac drivers
to be also benefit from these utility functions.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 2d0610581efc..d72346ff3247 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -672,16 +672,6 @@ enum ieee80211_key_alg { | |||
672 | }; | 672 | }; |
673 | 673 | ||
674 | /** | 674 | /** |
675 | * enum ieee80211_key_len - key length | ||
676 | * @LEN_WEP40: WEP 5-byte long key | ||
677 | * @LEN_WEP104: WEP 13-byte long key | ||
678 | */ | ||
679 | enum ieee80211_key_len { | ||
680 | LEN_WEP40 = 5, | ||
681 | LEN_WEP104 = 13, | ||
682 | }; | ||
683 | |||
684 | /** | ||
685 | * enum ieee80211_key_flags - key flags | 675 | * enum ieee80211_key_flags - key flags |
686 | * | 676 | * |
687 | * These flags are used for communication about keys between the driver | 677 | * These flags are used for communication about keys between the driver |
@@ -1812,24 +1802,6 @@ struct sk_buff * | |||
1812 | ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif); | 1802 | ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif); |
1813 | 1803 | ||
1814 | /** | 1804 | /** |
1815 | * ieee80211_get_hdrlen_from_skb - get header length from data | ||
1816 | * | ||
1817 | * Given an skb with a raw 802.11 header at the data pointer this function | ||
1818 | * returns the 802.11 header length in bytes (not including encryption | ||
1819 | * headers). If the data in the sk_buff is too short to contain a valid 802.11 | ||
1820 | * header the function returns 0. | ||
1821 | * | ||
1822 | * @skb: the frame | ||
1823 | */ | ||
1824 | unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb); | ||
1825 | |||
1826 | /** | ||
1827 | * ieee80211_hdrlen - get header length in bytes from frame control | ||
1828 | * @fc: frame control field in little-endian format | ||
1829 | */ | ||
1830 | unsigned int ieee80211_hdrlen(__le16 fc); | ||
1831 | |||
1832 | /** | ||
1833 | * ieee80211_get_tkip_key - get a TKIP rc4 for skb | 1805 | * ieee80211_get_tkip_key - get a TKIP rc4 for skb |
1834 | * | 1806 | * |
1835 | * This function computes a TKIP rc4 key for an skb. It computes | 1807 | * This function computes a TKIP rc4 key for an skb. It computes |