Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d46502d authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: move scan/assoc related stuff 



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 function change.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 243e84e9

drivers/net/wireless/libertas/assoc.c

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ static const u8 bssid_off[ETH_ALEN] __attribute__ ((aligned (2))) = 
 */

#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
Original line number Diff line number Diff line
@@ -3,7 +3,127 @@ 
#ifndef _LBS_ASSOC_H_

#define _LBS_ASSOC_H_



#include "dev.h"



#include "defs.h"

#include "host.h"





struct lbs_private;



/*

 * In theory, the IE is limited to the IE length, 255,

 * but in practice 64 bytes are enough.

 */

#define MAX_WPA_IE_LEN 64







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];

};



/**

 *  @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;

};





extern u8 lbs_bg_rates[MAX_RATES];



void lbs_association_worker(struct work_struct *work);

struct assoc_request *lbs_get_association_request(struct lbs_private *priv);

drivers/net/wireless/libertas/cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,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
Original line number Diff line number Diff line
@@ -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 @@ u8 lbs_data_rate_to_fw_index(u32 rate); 
/** 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_init(struct net_device *net); 
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
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in 
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 */