libertas: move association & scan-related away
PATCH 1/1 libertas: move association & scan-related away
Another cfg80211-preparation patch: removes some code/definitions from main.c and dev.h and put's it into assoc.c/.h, scan.c/.h.
No functional change.
Signed-off-by Holger Schurig <[email protected]>
drivers/net/wireless/libertas/dev.h +2 -153
@@ -6,75 +6,10 @@#ifndef _LBS_DEV_H_#define _LBS_DEV_H_ -#include <linux/netdevice.h> -#include <linux/wireless.h> -#include <linux/ethtool.h> -#include <linux/debugfs.h> +#include "scan.h" +#include "assoc.h" -#include "defs.h" -#include "host.h" -extern const struct ethtool_ops lbs_ethtool_ops; - -#define MAX_BSSID_PER_CHANNEL 16 - -#define NR_TX_QUEUE 3 - -/* For the extended Scan */ -#define MAX_EXTENDED_SCAN_BSSID_LIST MAX_BSSID_PER_CHANNEL * \ - MRVDRV_MAX_CHANNEL_SIZE + 1 - -#define MAX_REGION_CHANNEL_NUM 2 - -/** Chan-freq-TxPower mapping table*/ -struct chan_freq_power { -/** channel Number */ -u16 channel; -/** frequency of this channel */ -u32 freq; -/** Max allowed Tx power level */ -u16 maxtxpower; -/** TRUE:channel unsupported; FLASE:supported*/ -u8 unsupported; -}; - -/** region-band mapping table*/ -struct region_channel { -/** TRUE if this entry is valid */ -u8 valid; -/** region code for US, Japan ... */ -u8 region; -/** band B/G/A, used for BAND_CONFIG cmd */ -u8 band; -/** Actual No. of elements in the array below */ -u8 nrcfp; -/** chan-freq-txpower mapping table*/ -struct chan_freq_power *CFP; -}; - -struct lbs_802_11_security { -u8 WPAenabled; -u8 WPA2enabled; -u8 wep_enabled; -u8 auth_mode; -u32 key_mgmt; -}; - -/** Current Basic Service Set State Structure */ -struct current_bss_params { -/** bssid */ -u8 bssid[ETH_ALEN ]; -/** ssid */ -u8 ssid[IEEE80211_MAX_SSID_LEN +1 ]; -u8 ssid_len; - -/** band */ -u8 band; -/** channel */ -u8 channel; -/** zero-terminated array of supported data rates */ -u8 rates[MAX_RATES +1 ]; -};/** sleep_params */ struct sleep_params {
@@ -295,12 +230,6 @@struct enc_key wpa_mcast_key;struct enc_key wpa_unicast_key; -/* -* In theory, the IE is limited to the IE length, 255, -* but in practice 64 bytes are enough. -*/ -#define MAX_WPA_IE_LEN 64 -/** WPA Information Elements*/ u8 wpa_ie[MAX_WPA_IE_LEN ];u8 wpa_ie_len;
@@ -334,84 +263,4 @@extern struct cmd_confirm_sleep confirm_sleep; -/** -* @brief Structure used to store information for each beacon/probe response -*/ -struct bss_descriptor { -u8 bssid[ETH_ALEN ]; - -u8 ssid[IEEE80211_MAX_SSID_LEN +1 ]; -u8 ssid_len; - -u16 capability; -u32 rssi; -u32 channel; -u16 beaconperiod; -__le16 atimwindow; - -/* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */ -u8 mode; - -/* zero-terminated array of supported data rates */ -u8 rates[MAX_RATES +1 ]; - -unsigned long last_scanned; - -union ieee_phy_param_set phy; -union ieee_ss_param_set ss; - -u8 wpa_ie[MAX_WPA_IE_LEN ]; -size_t wpa_ie_len; -u8 rsn_ie[MAX_WPA_IE_LEN ]; -size_t rsn_ie_len; - -u8 mesh; - -struct list_head list; -}; - -/** Association request -* -* Encapsulates all the options that describe a specific assocation request -* or configuration of the wireless card's radio, mode, and security settings. -*/ -struct assoc_request { -#define ASSOC_FLAG_SSID 1 -#define ASSOC_FLAG_CHANNEL 2 -#define ASSOC_FLAG_BAND 3 -#define ASSOC_FLAG_MODE 4 -#define ASSOC_FLAG_BSSID 5 -#define ASSOC_FLAG_WEP_KEYS 6 -#define ASSOC_FLAG_WEP_TX_KEYIDX 7 -#define ASSOC_FLAG_WPA_MCAST_KEY 8 -#define ASSOC_FLAG_WPA_UCAST_KEY 9 -#define ASSOC_FLAG_SECINFO 10 -#define ASSOC_FLAG_WPA_IE 11 -unsigned long flags; - -u8 ssid[IEEE80211_MAX_SSID_LEN +1 ]; -u8 ssid_len; -u8 channel; -u8 band; -u8 mode; -u8 bssid[ETH_ALEN ] __attribute__ ((aligned (2 ))); - -/** WEP keys */ -struct enc_key wep_keys[4 ]; -u16 wep_tx_keyidx; - -/** WPA keys */ -struct enc_key wpa_mcast_key; -struct enc_key wpa_unicast_key; - -struct lbs_802_11_security secinfo; - -/** WPA Information Elements*/ -u8 wpa_ie[MAX_WPA_IE_LEN ]; -u8 wpa_ie_len; - -/* BSS to associate with for infrastructure of Ad-Hoc join */ -struct bss_descriptor bss; -}; -#endif
drivers/net/wireless/libertas/assoc.c +7 -0
@@ -23,6 +23,13 @@*/ #define CAPINFO_MASK (~(0xda00)) +/** +* 802.11b/g supported bitrates (in 500Kb/s units) +*/ +u8 lbs_bg_rates[MAX_RATES ] = + {0x02 ,0x04 ,0x0b ,0x16 ,0x0c ,0x12 ,0x18 ,0x24 ,0x30 ,0x48 ,0x60 ,0x6c , +0x00 ,0x00 }; +/** * @brief This function finds common rates between rates and card rates.
drivers/net/wireless/libertas/assoc.h +121 -1
128 lines not on this page · raw message
drivers/net/wireless/libertas/cmd.c +1 -0
@@ -13,6 +13,7 @@#include "dev.h" #include "assoc.h" #include "wext.h" +#include "scan.h" #include "cmd.h" static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node (struct lbs_private *priv);
drivers/net/wireless/libertas/decl.h +3 -3
@@ -10,6 +10,9 @@#include "defs.h" + +extern const struct ethtool_ops lbs_ethtool_ops; +/** Function Prototype Declaration */ struct lbs_private ;struct sk_buff ;
@@ -33,7 +36,6 @@/** The proc fs interface */ netdev_tx_t lbs_hard_start_xmit (struct sk_buff *skb,struct net_device *dev); -int lbs_set_regiontable (struct lbs_private *priv,u8 region,u8 band);int lbs_process_rxed_packet (struct lbs_private *priv,struct sk_buff *);
@@ -49,8 +51,6 @@void lbs_persist_config_remove (struct net_device *net);/* main.c */ -struct chan_freq_power *lbs_get_region_cfp_table (u8 region, -int *cfp_no);struct lbs_private *lbs_add_card (void *card,struct device *dmdev);void lbs_remove_card (struct lbs_private *priv);int lbs_start_card (struct lbs_private *priv);
drivers/net/wireless/libertas/defs.h +0 -1
@@ -322,7 +322,6 @@extern const char lbs_driver_version[];extern u16 lbs_region_code_to_index[MRVDRV_MAX_REGION_CODE ]; -extern u8 lbs_bg_rates[MAX_RATES ];/** ENUM definition*/ /** SNRNF_TYPE */
drivers/net/wireless/libertas/main.c +0 -182
200 lines not on this page · raw message
drivers/net/wireless/libertas/scan.c +184 -0
196 lines not on this page · raw message
drivers/net/wireless/libertas/scan.h +30 -0
@@ -9,8 +9,36 @@#include <net/iw_handler.h> +struct lbs_private ; +#define MAX_NETWORK_COUNT 128 +/** Chan-freq-TxPower mapping table*/ +struct chan_freq_power { +/** channel Number */ +u16 channel; +/** frequency of this channel */ +u32 freq; +/** Max allowed Tx power level */ +u16 maxtxpower; +/** TRUE:channel unsupported; FLASE:supported*/ +u8 unsupported; +}; + +/** region-band mapping table*/ +struct region_channel { +/** TRUE if this entry is valid */ +u8 valid; +/** region code for US, Japan ... */ +u8 region; +/** band B/G/A, used for BAND_CONFIG cmd */ +u8 band; +/** Actual No. of elements in the array below */ +u8 nrcfp; +/** chan-freq-txpower mapping table*/ +struct chan_freq_power *CFP; +}; +/** * @brief Maximum number of channels that can be sent in a setuserscan ioctl */
@@ -18,6 +46,8 @@int lbs_ssid_cmp (u8 *ssid1,u8 ssid1_len,u8 *ssid2,u8 ssid2_len); +int lbs_set_regiontable (struct lbs_private *priv,u8 region,u8 band); +int lbs_send_specific_ssid_scan (struct lbs_private *priv,u8 *ssid,u8 ssid_len);
Signature · 1 line
http://www.holgerschurig.de