wireless: move some utility functions from mac80211 to cfg80211
Subsystems (5)
PATCH v3 1/2 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 <[email protected]>
Signed-off-by Samuel Ortiz <[email protected]>
---
V2: address comments from Johannes Berg on moving ieee80211_key_len to
include/linux/ieee80211.h and keep ieee802_1d_to_ac static, etc.
V3: change users according to LEN_WEP{40,104} rename
drivers/net/wireless/ath/ar9170/main.c | 2 +- drivers/net/wireless/ath/ath5k/pcu.c | 4 +- drivers/net/wireless/ath/ath9k/hw.c | 8 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/rt2x00/rt2x00crypto.c | 2 +- include/linux/ieee80211.h | 9 + include/net/cfg80211.h | 47 +++++ include/net/mac80211.h | 28 --- net/mac80211/ieee80211_i.h | 2 - net/mac80211/mesh.h | 4 - net/mac80211/rx.c | 89 +-------- net/mac80211/util.c | 73 ------- net/mac80211/wme.c | 30 +--- net/wireless/util.c | 305 ++++++++++++++++++++++++++++ 14 files changed, 375 insertions(+), 230 deletions(-)
drivers/net/wireless/ath/ar9170/main.c +1 -1
@@ -1555,7 +1555,7 @@ static int ar9170_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,switch (key->alg) {case ALG_WEP : -if (key->keylen ==LEN_WEP40 ) +if (key->keylen ==WLAN_KEY_LEN_WEP40 ) ktype =AR9170_ENC_ALG_WEP64 ;else ktype =AR9170_ENC_ALG_WEP128 ;
drivers/net/wireless/ath/ath5k/pcu.c +2 -2
@@ -1038,9 +1038,9 @@ int ath5k_keycache_type(const struct ieee80211_key_conf *key)case ALG_CCMP :return AR5K_KEYTABLE_TYPE_CCM ;case ALG_WEP : -if (key->keylen ==LEN_WEP40 ) +if (key->keylen ==WLAN_KEY_LEN_WEP40 )return AR5K_KEYTABLE_TYPE_40 ; -else if (key->keylen ==LEN_WEP104 ) +else if (key->keylen ==WLAN_KEY_LEN_WEP104 )return AR5K_KEYTABLE_TYPE_104 ;return -EINVAL ;default :
drivers/net/wireless/ath/ath9k/hw.c +4 -4
@@ -2472,14 +2472,14 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry, }break ;case ATH9K_CIPHER_WEP : -if (k->kv_len <LEN_WEP40 ) { +if (k->kv_len <WLAN_KEY_LEN_WEP40 ) {DPRINTF (ah->ah_sc,ATH_DBG_ANY ,"WEP key length %u too small\n" , k->kv_len);return false; } -if (k->kv_len <=LEN_WEP40 ) +if (k->kv_len <=WLAN_KEY_LEN_WEP40 ) keyType =AR_KEYTABLE_TYPE_40 ; -else if (k->kv_len <=LEN_WEP104 ) +else if (k->kv_len <=WLAN_KEY_LEN_WEP104 ) keyType =AR_KEYTABLE_TYPE_104 ;else keyType =AR_KEYTABLE_TYPE_128 ;
@@ -2498,7 +2498,7 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry, key2 =get_unaligned_le32 (k->kv_val +6 ); key3 =get_unaligned_le16 (k->kv_val +10 ); key4 =get_unaligned_le32 (k->kv_val +12 ); -if (k->kv_len <=LEN_WEP104 ) +if (k->kv_len <=WLAN_KEY_LEN_WEP104 ) key4 &=0xff ;/*
drivers/net/wireless/b43/main.c +1 -1
@@ -3637,7 +3637,7 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, err = -EINVAL ;switch (key->alg) {case ALG_WEP : -if (key->keylen ==LEN_WEP40 ) +if (key->keylen ==WLAN_KEY_LEN_WEP40 ) algorithm =B43_SEC_ALGO_WEP40 ;else algorithm =B43_SEC_ALGO_WEP104 ;
drivers/net/wireless/rt2x00/rt2x00crypto.c +1 -1
@@ -33,7 +33,7 @@ enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key) {switch (key->alg) {case ALG_WEP : -if (key->keylen ==LEN_WEP40 ) +if (key->keylen ==WLAN_KEY_LEN_WEP40 )return CIPHER_WEP64 ;else return CIPHER_WEP128 ;
include/linux/ieee80211.h +9 -0
@@ -493,6 +493,7 @@ struct ieee80211s_hdr {/* Mesh flags */ #define MESH_FLAGS_AE_A4 0x1#define MESH_FLAGS_AE_A5_A6 0x2 +#define MESH_FLAGS_AE 0x3#define MESH_FLAGS_PS_DEEP 0x4/**
@@ -1085,6 +1086,14 @@ enum ieee80211_spectrum_mgmt_actioncode { WLAN_ACTION_SPCT_CHL_SWITCH = 4, }; +/* Security key length */ +enum ieee80211_key_len { +WLAN_KEY_LEN_WEP40 =5 , +WLAN_KEY_LEN_WEP104 =13 , +WLAN_KEY_LEN_CCMP =16 , +WLAN_KEY_LEN_TKIP =32 , +}; +/* * IEEE 802.11-2007 7.3.2.9 Country information element *
include/net/cfg80211.h +47 -0
53 lines not on this page · raw message
include/net/mac80211.h +0 -28
@@ -673,16 +673,6 @@ enum ieee80211_key_alg { };/** -* enum ieee80211_key_len - key length -* @LEN_WEP40: WEP 5-byte long key -* @LEN_WEP104: WEP 13-byte long key -*/ -enum ieee80211_key_len { -LEN_WEP40 =5 , -LEN_WEP104 =13 , -}; - -/** * enum ieee80211_key_flags - key flags * * These flags are used for communication about keys between the driver
@@ -1813,24 +1803,6 @@ struct sk_buff * ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);/** -* ieee80211_get_hdrlen_from_skb - get header length from data -* -* Given an skb with a raw 802.11 header at the data pointer this function -* returns the 802.11 header length in bytes (not including encryption -* headers). If the data in the sk_buff is too short to contain a valid 802.11 -* header the function returns 0. -* -* @skb: the frame -*/ -unsigned int ieee80211_get_hdrlen_from_skb (const struct sk_buff *skb); - -/** -* ieee80211_hdrlen - get header length in bytes from frame control -* @fc: frame control field in little-endian format -*/ -unsigned int ieee80211_hdrlen (__le16 fc); - -/** * ieee80211_get_tkip_key - get a TKIP rc4 for skb * * This function computes a TKIP rc4 key for an skb. It computes
net/mac80211/ieee80211_i.h +0 -2
@@ -1085,8 +1085,6 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw)/* utility functions/constants */ extern void *mac80211_wiphy_privid;/* for wiphy privid */ -extern const unsigned char rfc1042_header[6 ]; -extern const unsigned char bridge_tunnel_header[6 ];u8 *ieee80211_get_bssid (struct ieee80211_hdr *hdr,size_t len,enum nl80211_iftype type); int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
net/mac80211/mesh.h +0 -4
@@ -191,12 +191,8 @@ struct mesh_rmc {#define PLINK_CATEGORY 30#define MESH_PATH_SEL_CATEGORY 32 -/* Mesh Header Flags */ -#define IEEE80211S_FLAGS_AE 0x3 -/* Public interfaces */ /* Various */ -int ieee80211_get_mesh_hdrlen (struct ieee80211s_hdr *meshhdr);int ieee80211_new_mesh_header (struct ieee80211s_hdr *meshhdr,struct ieee80211_sub_if_data *sdata); int mesh_rmc_check(u8 *addr, struct ieee80211s_hdr *mesh_hdr,
net/mac80211/rx.c +4 -85
111 lines not on this page · raw message
net/mac80211/util.c +0 -73
85 lines not on this page · raw message
net/mac80211/wme.c +1 -29
@@ -23,34 +23,6 @@*/ const int ieee802_1d_to_ac[8 ] = {2 ,3 ,3 ,2 ,1 ,1 ,0 ,0 }; -static const char llc_ip_hdr[8 ] = {0xAA ,0xAA ,0x3 ,0 ,0 ,0 ,0x08 ,0 }; - -/* Given a data frame determine the 802.1p/1d tag to use. */ -static unsigned int classify_1d (struct sk_buff *skb) -{ -unsigned int dscp; - -/* skb->priority values from 256->263 are magic values to -* directly indicate a specific 802.1d priority. This is used -* to allow 802.1d priority to be passed directly in from VLAN -* tags, etc. -*/ -if (skb->priority >=256 && skb->priority <=263 ) -return skb->priority -256 ; - -switch (skb->protocol) { -case htons (ETH_P_IP ): - dscp =ip_hdr (skb)->tos &0xfc ; -break ; - -default : -return 0 ; - } - -return dscp >>5 ; -} - -static int wme_downgrade_ac (struct sk_buff *skb) {switch (skb->priority) {
@@ -94,7 +66,7 @@ static u16 classify80211(struct ieee80211_local *local, struct sk_buff *skb)/* use the data classifier to determine what 802.1d tag the * data frame has */ - skb->priority =classify_1d (skb); + skb->priority =cfg80211_classify8021d (skb);/* in case we are a client verify acm is not set for this ac */ while (unlikely (local->wmm_acm &BIT (skb->priority))) {
net/wireless/util.c +305 -0
315 lines not on this page · raw message
Signature · 1 line
1.6.0.4