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

Commit 10078321 authored Nov 15, 2007 by Holger Schurig Committed by David S. Miller Jan 28, 2008

libertas: move to uniform lbs_/LBS_ namespace



This patch unifies the namespace of variables, functions defines
and structures. It does:

- rename libertas_XXX to lbs_XXX
- rename LIBERTAS_XXX to lbs_XXX
- rename wlan_XXX to lbs_XXX
- rename WLAN_XXX to LBS_XXX (but only those that were
  defined in libertas-local *.h files, e.g. not defines
  from net/ieee80211.h)

While passing, I fixed some checkpatch.pl errors too.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 9a62f73b

drivers/net/wireless/libertas/11d.c

+36 −36

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ static struct chan_freq_power channel_freq_power_UN_BG[] = {
		{14, 2484, TX_PWR_DEFAULT}
		};

		static u8 wlan_region_2_code(u8 * region)
		static u8 lbs_region_2_code(u8 *region)
		{
		u8 i;

		@@ -60,7 +60,7 @@ static u8 wlan_region_2_code(u8 * region)
		return (region_code_mapping[0].code);
		}

		static u8 *wlan_code_2_region(u8 code)
		static u8 *lbs_code_2_region(u8 code)
		{
		u8 i;

		@@ -79,7 +79,7 @@ static u8 *wlan_code_2_region(u8 code)
		* @param nrchan number of channels
		* @return the nrchan-th chan number
		*/
		static u8 wlan_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 * chan)
		static u8 lbs_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 *chan)
		/find the nrchan-th chan after the firstchan/
		{
		u8 i;
		@@ -113,7 +113,7 @@ static u8 wlan_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 * chan)
		* @param parsed_region_chan pointer to parsed_region_chan_11d
		* @return TRUE; FALSE
		*/
		static u8 wlan_channel_known_11d(u8 chan,
		static u8 lbs_channel_known_11d(u8 chan,
		struct parsed_region_chan_11d * parsed_region_chan)
		{
		struct chan_power_11d *chanpwr = parsed_region_chan->chanpwr;
		@@ -134,7 +134,7 @@ static u8 wlan_channel_known_11d(u8 chan,
		return 0;
		}

		u32 libertas_chan_2_freq(u8 chan, u8 band)
		u32 lbs_chan_2_freq(u8 chan, u8 band)
		{
		struct chan_freq_power *cf;
		u16 i;
		@@ -152,7 +152,7 @@ u32 libertas_chan_2_freq(u8 chan, u8 band)

		static int generate_domain_info_11d(struct parsed_region_chan_11d
		*parsed_region_chan,
		struct wlan_802_11d_domain_reg * domaininfo)
		struct lbs_802_11d_domain_reg *domaininfo)
		{
		u8 nr_subband = 0;

		@@ -217,7 +217,7 @@ static int generate_domain_info_11d(struct parsed_region_chan_11d
		* @param *parsed_region_chan pointer to parsed_region_chan_11d
		* @return N/A
		*/
		static void wlan_generate_parsed_region_chan_11d(struct region_channel * region_chan,
		static void lbs_generate_parsed_region_chan_11d(struct region_channel *region_chan,
		struct parsed_region_chan_11d *
		parsed_region_chan)
		{
		@@ -238,7 +238,7 @@ static void wlan_generate_parsed_region_chan_11d(struct region_channel * region_
		parsed_region_chan->band = region_chan->band;
		parsed_region_chan->region = region_chan->region;
		memcpy(parsed_region_chan->countrycode,
		wlan_code_2_region(region_chan->region), COUNTRY_CODE_LEN);
		lbs_code_2_region(region_chan->region), COUNTRY_CODE_LEN);

		lbs_deb_11d("region 0x%x, band %d\n", parsed_region_chan->region,
		parsed_region_chan->band);
		@@ -264,7 +264,7 @@ static void wlan_generate_parsed_region_chan_11d(struct region_channel * region_
		* @param chan chan
		* @return TRUE;FALSE
		*/
		static u8 wlan_region_chan_supported_11d(u8 region, u8 band, u8 chan)
		static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan)
		{
		struct chan_freq_power *cfp;
		int cfp_no;
		@@ -273,7 +273,7 @@ static u8 wlan_region_chan_supported_11d(u8 region, u8 band, u8 chan)

		lbs_deb_enter(LBS_DEB_11D);

		cfp = libertas_get_region_cfp_table(region, band, &cfp_no);
		cfp = lbs_get_region_cfp_table(region, band, &cfp_no);
		if (cfp == NULL)
		return 0;

		@@ -338,7 +338,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*

		/Step1: check region_code /
		parsed_region_chan->region = region =
		wlan_region_2_code(countryinfo->countrycode);
		lbs_region_2_code(countryinfo->countrycode);

		lbs_deb_11d("regioncode=%x\n", (u8) parsed_region_chan->region);
		lbs_deb_hex(LBS_DEB_11D, "countrycode", (char *)countryinfo->countrycode,
		@@ -367,7 +367,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
		for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) {
		/step4: channel is supported? /

		if (!wlan_get_chan_11d(band, firstchan, i, &curchan)) {
		if (!lbs_get_chan_11d(band, firstchan, i, &curchan)) {
		/* Chan is not found in UN table */
		lbs_deb_11d("chan is not supported: %d \n", i);
		break;
		@@ -375,7 +375,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*

		lastchan = curchan;

		if (wlan_region_chan_supported_11d
		if (lbs_region_chan_supported_11d
		(region, band, curchan)) {
		/step5: Check if curchan is supported by mrvl in region /
		parsed_region_chan->chanpwr[idx].chan = curchan;
		@@ -411,14 +411,14 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
		* @param parsed_region_chan pointer to parsed_region_chan_11d
		* @return PASSIVE if chan is unknown; ACTIVE if chan is known
		*/
		u8 libertas_get_scan_type_11d(u8 chan,
		u8 lbs_get_scan_type_11d(u8 chan,
		struct parsed_region_chan_11d * parsed_region_chan)
		{
		u8 scan_type = CMD_SCAN_TYPE_PASSIVE;

		lbs_deb_enter(LBS_DEB_11D);

		if (wlan_channel_known_11d(chan, parsed_region_chan)) {
		if (lbs_channel_known_11d(chan, parsed_region_chan)) {
		lbs_deb_11d("found, do active scan\n");
		scan_type = CMD_SCAN_TYPE_ACTIVE;
		} else {
		@@ -430,7 +430,7 @@ u8 libertas_get_scan_type_11d(u8 chan,

		}

		void libertas_init_11d(wlan_private * priv)
		void lbs_init_11d(lbs_private * priv)
		{
		priv->adapter->enable11d = 0;
		memset(&(priv->adapter->parsed_region_chan), 0,
		@@ -440,10 +440,10 @@ void libertas_init_11d(wlan_private * priv)

		/**
		* @brief This function sets DOMAIN INFO to FW
		* @param priv pointer to wlan_private
		* @param priv pointer to lbs_private
		* @return 0; -1
		*/
		static int set_domain_info_11d(wlan_private * priv)
		static int set_domain_info_11d(lbs_private * priv)
		{
		int ret;

		@@ -452,7 +452,7 @@ static int set_domain_info_11d(wlan_private * priv)
		return 0;
		}

		ret = libertas_prepare_and_send_command(priv, CMD_802_11D_DOMAIN_INFO,
		ret = lbs_prepare_and_send_command(priv, CMD_802_11D_DOMAIN_INFO,
		CMD_ACT_SET,
		CMD_OPTION_WAITFORRSP, 0, NULL);
		if (ret)
		@@ -463,13 +463,13 @@ static int set_domain_info_11d(wlan_private * priv)

		/**
		* @brief This function setups scan channels
		* @param priv pointer to wlan_private
		* @param priv pointer to lbs_private
		* @param band band
		* @return 0
		*/
		int libertas_set_universaltable(wlan_private * priv, u8 band)
		int lbs_set_universaltable(lbs_private * priv, u8 band)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		u16 size = sizeof(struct chan_freq_power);
		u16 i = 0;

		@@ -492,20 +492,20 @@ int libertas_set_universaltable(wlan_private * priv, u8 band)

		/**
		* @brief This function implements command CMD_802_11D_DOMAIN_INFO
		* @param priv pointer to wlan_private
		* @param priv pointer to lbs_private
		* @param cmd pointer to cmd buffer
		* @param cmdno cmd ID
		* @param cmdOption cmd action
		* @return 0
		*/
		int libertas_cmd_802_11d_domain_info(wlan_private * priv,
		int lbs_cmd_802_11d_domain_info(lbs_private * priv,
		struct cmd_ds_command *cmd, u16 cmdno,
		u16 cmdoption)
		{
		struct cmd_ds_802_11d_domain_info *pdomaininfo =
		&cmd->params.domaininfo;
		struct mrvlietypes_domainparamset *domain = &pdomaininfo->domain;
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		u8 nr_subband = adapter->domainreg.nr_subband;

		lbs_deb_enter(LBS_DEB_11D);
		@@ -552,11 +552,11 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv,

		/**
		* @brief This function parses countryinfo from AP and download country info to FW
		* @param priv pointer to wlan_private
		* @param priv pointer to lbs_private
		* @param resp pointer to command response buffer
		* @return 0; -1
		*/
		int libertas_ret_802_11d_domain_info(wlan_private * priv,
		int lbs_ret_802_11d_domain_info(lbs_private * priv,
		struct cmd_ds_command *resp)
		{
		struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;
		@@ -598,14 +598,14 @@ int libertas_ret_802_11d_domain_info(wlan_private * priv,

		/**
		* @brief This function parses countryinfo from AP and download country info to FW
		* @param priv pointer to wlan_private
		* @param priv pointer to lbs_private
		* @return 0; -1
		*/
		int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,
		int lbs_parse_dnld_countryinfo_11d(lbs_private * priv,
		struct bss_descriptor * bss)
		{
		int ret;
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;

		lbs_deb_enter(LBS_DEB_11D);
		if (priv->adapter->enable11d) {
		@@ -620,7 +620,7 @@ int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,
		}

		memset(&adapter->domainreg, 0,
		sizeof(struct wlan_802_11d_domain_reg));
		sizeof(struct lbs_802_11d_domain_reg));
		generate_domain_info_11d(&adapter->parsed_region_chan,
		&adapter->domainreg);

		@@ -640,13 +640,13 @@ int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,

		/**
		* @brief This function generates 11D info from user specified regioncode and download to FW
		* @param priv pointer to wlan_private
		* @param priv pointer to lbs_private
		* @return 0; -1
		*/
		int libertas_create_dnld_countryinfo_11d(wlan_private * priv)
		int lbs_create_dnld_countryinfo_11d(lbs_private * priv)
		{
		int ret;
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		struct region_channel *region_chan;
		u8 j;

		@@ -679,12 +679,12 @@ int libertas_create_dnld_countryinfo_11d(wlan_private * priv)

		memset(&adapter->parsed_region_chan, 0,
		sizeof(struct parsed_region_chan_11d));
		wlan_generate_parsed_region_chan_11d(region_chan,
		lbs_generate_parsed_region_chan_11d(region_chan,
		&adapter->
		parsed_region_chan);

		memset(&adapter->domainreg, 0,
		sizeof(struct wlan_802_11d_domain_reg));
		sizeof(struct lbs_802_11d_domain_reg));
		generate_domain_info_11d(&adapter->parsed_region_chan,
		&adapter->domainreg);

drivers/net/wireless/libertas/11d.h

+12 −12

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@
		* This header file contains data structures and
		* function declarations of 802.11d
		*/
		#ifndef _WLAN_11D_
		#define _WLAN_11D_
		#ifndef _LBS_11D_
		#define _LBS_11D_

		#include "types.h"
		#include "defs.h"
		@@ -52,7 +52,7 @@ struct cmd_ds_802_11d_domain_info {
		} __attribute__ ((packed));

		/** domain regulatory information */
		struct wlan_802_11d_domain_reg {
		struct lbs_802_11d_domain_reg {
		/** country Code*/
		u8 countrycode[COUNTRY_CODE_LEN];
		/** No. of subband*/
		@@ -78,26 +78,26 @@ struct region_code_mapping {
		u8 code;
		};

		u8 libertas_get_scan_type_11d(u8 chan,
		u8 lbs_get_scan_type_11d(u8 chan,
		struct parsed_region_chan_11d *parsed_region_chan);

		u32 libertas_chan_2_freq(u8 chan, u8 band);
		u32 lbs_chan_2_freq(u8 chan, u8 band);

		void libertas_init_11d(wlan_private * priv);
		void lbs_init_11d(lbs_private * priv);

		int libertas_set_universaltable(wlan_private * priv, u8 band);
		int lbs_set_universaltable(lbs_private * priv, u8 band);

		int libertas_cmd_802_11d_domain_info(wlan_private * priv,
		int lbs_cmd_802_11d_domain_info(lbs_private * priv,
		struct cmd_ds_command *cmd, u16 cmdno,
		u16 cmdOption);

		int libertas_ret_802_11d_domain_info(wlan_private * priv,
		int lbs_ret_802_11d_domain_info(lbs_private * priv,
		struct cmd_ds_command *resp);

		struct bss_descriptor;
		int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,
		int lbs_parse_dnld_countryinfo_11d(lbs_private * priv,
		struct bss_descriptor * bss);

		int libertas_create_dnld_countryinfo_11d(wlan_private * priv);
		int lbs_create_dnld_countryinfo_11d(lbs_private * priv);

		#endif /* _WLAN_11D_ */
		#endif

drivers/net/wireless/libertas/assoc.c

+60 −60

Original line number	Diff line number	Diff line
		@@ -38,10 +38,10 @@ static void print_assoc_req(const char * extra, struct assoc_request * assoc_req
		}


		static int assoc_helper_essid(wlan_private *priv,
		static int assoc_helper_essid(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		int ret = 0;
		struct bss_descriptor * bss;
		int channel = -1;
		@@ -58,15 +58,15 @@ static int assoc_helper_essid(wlan_private *priv,
		lbs_deb_assoc("New SSID requested: '%s'\n",
		escape_essid(assoc_req->ssid, assoc_req->ssid_len));
		if (assoc_req->mode == IW_MODE_INFRA) {
		libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
		lbs_send_specific_ssid_scan(priv, assoc_req->ssid,
		assoc_req->ssid_len, 0);

		bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
		bss = lbs_find_ssid_in_list(adapter, assoc_req->ssid,
		assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);
		if (bss != NULL) {
		lbs_deb_assoc("SSID found in scan list, associating\n");
		memcpy(&assoc_req->bss, bss, sizeof(struct bss_descriptor));
		ret = wlan_associate(priv, assoc_req);
		ret = lbs_associate(priv, assoc_req);
		} else {
		lbs_deb_assoc("SSID not found; cannot associate\n");
		}
		@@ -74,23 +74,23 @@ static int assoc_helper_essid(wlan_private *priv,
		/* Scan for the network, do not save previous results. Stale
		* scan data will cause us to join a non-existant adhoc network
		*/
		libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
		lbs_send_specific_ssid_scan(priv, assoc_req->ssid,
		assoc_req->ssid_len, 1);

		/* Search for the requested SSID in the scan table */
		bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
		bss = lbs_find_ssid_in_list(adapter, assoc_req->ssid,
		assoc_req->ssid_len, NULL, IW_MODE_ADHOC, channel);
		if (bss != NULL) {
		lbs_deb_assoc("SSID found, will join\n");
		memcpy(&assoc_req->bss, bss, sizeof(struct bss_descriptor));
		libertas_join_adhoc_network(priv, assoc_req);
		lbs_join_adhoc_network(priv, assoc_req);
		} else {
		/* else send START command */
		lbs_deb_assoc("SSID not found, creating adhoc network\n");
		memcpy(&assoc_req->bss.ssid, &assoc_req->ssid,
		IW_ESSID_MAX_SIZE);
		assoc_req->bss.ssid_len = assoc_req->ssid_len;
		libertas_start_adhoc_network(priv, assoc_req);
		lbs_start_adhoc_network(priv, assoc_req);
		}
		}

		@@ -99,10 +99,10 @@ static int assoc_helper_essid(wlan_private *priv,
		}


		static int assoc_helper_bssid(wlan_private *priv,
		static int assoc_helper_bssid(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		int ret = 0;
		struct bss_descriptor * bss;
		DECLARE_MAC_BUF(mac);
		@@ -111,7 +111,7 @@ static int assoc_helper_bssid(wlan_private *priv,
		print_mac(mac, assoc_req->bssid));

		/* Search for index position in list for requested MAC */
		bss = libertas_find_bssid_in_list(adapter, assoc_req->bssid,
		bss = lbs_find_bssid_in_list(adapter, assoc_req->bssid,
		assoc_req->mode);
		if (bss == NULL) {
		lbs_deb_assoc("ASSOC: WAP: BSSID %s not found, "
		@@ -121,10 +121,10 @@ static int assoc_helper_bssid(wlan_private *priv,

		memcpy(&assoc_req->bss, bss, sizeof(struct bss_descriptor));
		if (assoc_req->mode == IW_MODE_INFRA) {
		ret = wlan_associate(priv, assoc_req);
		lbs_deb_assoc("ASSOC: wlan_associate(bssid) returned %d\n", ret);
		ret = lbs_associate(priv, assoc_req);
		lbs_deb_assoc("ASSOC: lbs_associate(bssid) returned %d\n", ret);
		} else if (assoc_req->mode == IW_MODE_ADHOC) {
		libertas_join_adhoc_network(priv, assoc_req);
		lbs_join_adhoc_network(priv, assoc_req);
		}

		out:
		@@ -133,7 +133,7 @@ static int assoc_helper_bssid(wlan_private *priv,
		}


		static int assoc_helper_associate(wlan_private *priv,
		static int assoc_helper_associate(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		int ret = 0, done = 0;
		@@ -162,10 +162,10 @@ static int assoc_helper_associate(wlan_private *priv,
		}


		static int assoc_helper_mode(wlan_private *priv,
		static int assoc_helper_mode(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		int ret = 0;

		lbs_deb_enter(LBS_DEB_ASSOC);
		@@ -175,12 +175,12 @@ static int assoc_helper_mode(wlan_private *priv,

		if (assoc_req->mode == IW_MODE_INFRA) {
		if (adapter->psstate != PS_STATE_FULL_POWER)
		libertas_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
		adapter->psmode = WLAN802_11POWERMODECAM;
		lbs_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
		adapter->psmode = LBS802_11POWERMODECAM;
		}

		adapter->mode = assoc_req->mode;
		ret = libertas_prepare_and_send_command(priv,
		ret = lbs_prepare_and_send_command(priv,
		CMD_802_11_SNMP_MIB,
		0, CMD_OPTION_WAITFORRSP,
		OID_802_11_INFRASTRUCTURE_MODE,
		@@ -192,26 +192,26 @@ static int assoc_helper_mode(wlan_private *priv,
		}


		static int update_channel(wlan_private * priv)
		static int update_channel(lbs_private * priv)
		{
		/* the channel in f/w could be out of sync, get the current channel */
		return libertas_prepare_and_send_command(priv, CMD_802_11_RF_CHANNEL,
		return lbs_prepare_and_send_command(priv, CMD_802_11_RF_CHANNEL,
		CMD_OPT_802_11_RF_CHANNEL_GET,
		CMD_OPTION_WAITFORRSP, 0, NULL);
		}

		void libertas_sync_channel(struct work_struct *work)
		void lbs_sync_channel(struct work_struct *work)
		{
		wlan_private *priv = container_of(work, wlan_private, sync_channel);
		lbs_private *priv = container_of(work, lbs_private, sync_channel);

		if (update_channel(priv) != 0)
		lbs_pr_info("Channel synchronization failed.");
		}

		static int assoc_helper_channel(wlan_private *priv,
		static int assoc_helper_channel(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		int ret = 0;

		lbs_deb_enter(LBS_DEB_ASSOC);
		@@ -227,7 +227,7 @@ static int assoc_helper_channel(wlan_private *priv,
		lbs_deb_assoc("ASSOC: channel: %d -> %d\n",
		adapter->curbssparams.channel, assoc_req->channel);

		ret = libertas_prepare_and_send_command(priv, CMD_802_11_RF_CHANNEL,
		ret = lbs_prepare_and_send_command(priv, CMD_802_11_RF_CHANNEL,
		CMD_OPT_802_11_RF_CHANNEL_SET,
		CMD_OPTION_WAITFORRSP, 0, &assoc_req->channel);
		if (ret < 0) {
		@@ -263,10 +263,10 @@ static int assoc_helper_channel(wlan_private *priv,
		}


		static int assoc_helper_wep_keys(wlan_private *priv,
		static int assoc_helper_wep_keys(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		int i;
		int ret = 0;

		@@ -277,13 +277,13 @@ static int assoc_helper_wep_keys(wlan_private *priv,
		\|\| assoc_req->wep_keys[1].len
		\|\| assoc_req->wep_keys[2].len
		\|\| assoc_req->wep_keys[3].len) {
		ret = libertas_prepare_and_send_command(priv,
		ret = lbs_prepare_and_send_command(priv,
		CMD_802_11_SET_WEP,
		CMD_ACT_ADD,
		CMD_OPTION_WAITFORRSP,
		0, assoc_req);
		} else {
		ret = libertas_prepare_and_send_command(priv,
		ret = lbs_prepare_and_send_command(priv,
		CMD_802_11_SET_WEP,
		CMD_ACT_REMOVE,
		CMD_OPTION_WAITFORRSP,
		@@ -298,7 +298,7 @@ static int assoc_helper_wep_keys(wlan_private *priv,
		adapter->currentpacketfilter \|= CMD_ACT_MAC_WEP_ENABLE;
		else
		adapter->currentpacketfilter &= ~CMD_ACT_MAC_WEP_ENABLE;
		ret = libertas_set_mac_packet_filter(priv);
		ret = lbs_set_mac_packet_filter(priv);
		if (ret)
		goto out;

		@@ -318,10 +318,10 @@ static int assoc_helper_wep_keys(wlan_private *priv,
		return ret;
		}

		static int assoc_helper_secinfo(wlan_private *priv,
		static int assoc_helper_secinfo(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		int ret = 0;
		u32 do_wpa;
		u32 rsn = 0;
		@@ -329,9 +329,9 @@ static int assoc_helper_secinfo(wlan_private *priv,
		lbs_deb_enter(LBS_DEB_ASSOC);

		memcpy(&adapter->secinfo, &assoc_req->secinfo,
		sizeof(struct wlan_802_11_security));
		sizeof(struct lbs_802_11_security));

		ret = libertas_set_mac_packet_filter(priv);
		ret = lbs_set_mac_packet_filter(priv);
		if (ret)
		goto out;

		@@ -341,7 +341,7 @@ static int assoc_helper_secinfo(wlan_private *priv,
		*/

		/* Get RSN enabled/disabled */
		ret = libertas_prepare_and_send_command(priv,
		ret = lbs_prepare_and_send_command(priv,
		CMD_802_11_ENABLE_RSN,
		CMD_ACT_GET,
		CMD_OPTION_WAITFORRSP,
		@@ -358,7 +358,7 @@ static int assoc_helper_secinfo(wlan_private *priv,

		/* Set RSN enabled/disabled */
		rsn = do_wpa;
		ret = libertas_prepare_and_send_command(priv,
		ret = lbs_prepare_and_send_command(priv,
		CMD_802_11_ENABLE_RSN,
		CMD_ACT_SET,
		CMD_OPTION_WAITFORRSP,
		@@ -370,7 +370,7 @@ static int assoc_helper_secinfo(wlan_private *priv,
		}


		static int assoc_helper_wpa_keys(wlan_private *priv,
		static int assoc_helper_wpa_keys(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		int ret = 0;
		@@ -385,7 +385,7 @@ static int assoc_helper_wpa_keys(wlan_private *priv,

		if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
		clear_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
		ret = libertas_prepare_and_send_command(priv,
		ret = lbs_prepare_and_send_command(priv,
		CMD_802_11_KEY_MATERIAL,
		CMD_ACT_SET,
		CMD_OPTION_WAITFORRSP,
		@@ -399,7 +399,7 @@ static int assoc_helper_wpa_keys(wlan_private *priv,
		if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
		clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);

		ret = libertas_prepare_and_send_command(priv,
		ret = lbs_prepare_and_send_command(priv,
		CMD_802_11_KEY_MATERIAL,
		CMD_ACT_SET,
		CMD_OPTION_WAITFORRSP,
		@@ -413,10 +413,10 @@ static int assoc_helper_wpa_keys(wlan_private *priv,
		}


		static int assoc_helper_wpa_ie(wlan_private *priv,
		static int assoc_helper_wpa_ie(lbs_private *priv,
		struct assoc_request * assoc_req)
		{
		wlan_adapter *adapter = priv->adapter;
		lbs_adapter *adapter = priv->adapter;
		int ret = 0;

		lbs_deb_enter(LBS_DEB_ASSOC);
		@@ -434,10 +434,10 @@ static int assoc_helper_wpa_ie(wlan_private *priv,
		}


		static int should_deauth_infrastructure(wlan_adapter *adapter,
		static int should_deauth_infrastructure(lbs_adapter *adapter,
		struct assoc_request * assoc_req)
		{
		if (adapter->connect_status != LIBERTAS_CONNECTED)
		if (adapter->connect_status != LBS_CONNECTED)
		return 0;

		if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
		@@ -475,13 +475,13 @@ static int should_deauth_infrastructure(wlan_adapter *adapter,
		}


		static int should_stop_adhoc(wlan_adapter *adapter,
		static int should_stop_adhoc(lbs_adapter *adapter,
		struct assoc_request * assoc_req)
		{
		if (adapter->connect_status != LIBERTAS_CONNECTED)
		if (adapter->connect_status != LBS_CONNECTED)
		return 0;

		if (libertas_ssid_cmp(adapter->curbssparams.ssid,
		if (lbs_ssid_cmp(adapter->curbssparams.ssid,
		adapter->curbssparams.ssid_len,
		assoc_req->ssid, assoc_req->ssid_len) != 0)
		return 1;
		@@ -501,10 +501,10 @@ static int should_stop_adhoc(wlan_adapter *adapter,
		}


		void libertas_association_worker(struct work_struct *work)
		void lbs_association_worker(struct work_struct *work)
		{
		wlan_private *priv = container_of(work, wlan_private, assoc_work.work);
		wlan_adapter *adapter = priv->adapter;
		lbs_private *priv = container_of(work, lbs_private, assoc_work.work);
		lbs_adapter *adapter = priv->adapter;
		struct assoc_request * assoc_req = NULL;
		int ret = 0;
		int find_any_ssid = 0;
		@@ -538,7 +538,7 @@ void libertas_association_worker(struct work_struct *work)
		if (find_any_ssid) {
		u8 new_mode;

		ret = libertas_find_best_network_ssid(priv, assoc_req->ssid,
		ret = lbs_find_best_network_ssid(priv, assoc_req->ssid,
		&assoc_req->ssid_len, assoc_req->mode, &new_mode);
		if (ret) {
		lbs_deb_assoc("Could not find best network\n");
		@@ -559,7 +559,7 @@ void libertas_association_worker(struct work_struct *work)
		*/
		if (adapter->mode == IW_MODE_INFRA) {
		if (should_deauth_infrastructure(adapter, assoc_req)) {
		ret = libertas_send_deauthentication(priv);
		ret = lbs_send_deauthentication(priv);
		if (ret) {
		lbs_deb_assoc("Deauthentication due to new "
		"configuration request failed: %d\n",
		@@ -568,7 +568,7 @@ void libertas_association_worker(struct work_struct *work)
		}
		} else if (adapter->mode == IW_MODE_ADHOC) {
		if (should_stop_adhoc(adapter, assoc_req)) {
		ret = libertas_stop_adhoc_network(priv);
		ret = lbs_stop_adhoc_network(priv);
		if (ret) {
		lbs_deb_assoc("Teardown of AdHoc network due to "
		"new configuration request failed: %d\n",
		@@ -649,7 +649,7 @@ void libertas_association_worker(struct work_struct *work)
		success = 0;
		}

		if (adapter->connect_status != LIBERTAS_CONNECTED) {
		if (adapter->connect_status != LBS_CONNECTED) {
		lbs_deb_assoc("ASSOC: association attempt unsuccessful, "
		"not connected.\n");
		success = 0;
		@@ -661,11 +661,11 @@ void libertas_association_worker(struct work_struct *work)
		escape_essid(adapter->curbssparams.ssid,
		adapter->curbssparams.ssid_len),
		print_mac(mac, adapter->curbssparams.bssid));
		libertas_prepare_and_send_command(priv,
		lbs_prepare_and_send_command(priv,
		CMD_802_11_RSSI,
		0, CMD_OPTION_WAITFORRSP, 0, NULL);

		libertas_prepare_and_send_command(priv,
		lbs_prepare_and_send_command(priv,
		CMD_802_11_GET_LOG,
		0, CMD_OPTION_WAITFORRSP, 0, NULL);
		} else {
		@@ -692,7 +692,7 @@ void libertas_association_worker(struct work_struct *work)
		/*
		* Caller MUST hold any necessary locks
		*/
		struct assoc_request * wlan_get_association_request(wlan_adapter *adapter)
		struct assoc_request lbs_get_association_request(lbs_adapter adapter)
		{
		struct assoc_request * assoc_req;

		@@ -753,7 +753,7 @@ struct assoc_request * wlan_get_association_request(wlan_adapter *adapter)

		if (!test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
		memcpy(&assoc_req->secinfo, &adapter->secinfo,
		sizeof(struct wlan_802_11_security));
		sizeof(struct lbs_802_11_security));
		}

		if (!test_bit(ASSOC_FLAG_WPA_IE, &assoc_req->flags)) {

drivers/net/wireless/libertas/assoc.h

+6 −6

Original line number	Diff line number	Diff line
		/* Copyright (C) 2006, Red Hat, Inc. */

		#ifndef _WLAN_ASSOC_H_
		#define _WLAN_ASSOC_H_
		#ifndef _LBS_ASSOC_H_
		#define _LBS_ASSOC_H_

		#include "dev.h"

		void libertas_association_worker(struct work_struct *work);
		void lbs_association_worker(struct work_struct *work);

		struct assoc_request * wlan_get_association_request(wlan_adapter *adapter);
		struct assoc_request * lbs_get_association_request(lbs_adapter *adapter);

		void libertas_sync_channel(struct work_struct *work);
		void lbs_sync_channel(struct work_struct *work);

		#endif /* _WLAN_ASSOC_H */
		#endif /* _LBS_ASSOC_H */