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

Commit 889c05bd authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] libertas: remove WLAN_802_11_WEP_STATUS enum 



Also change WEPstatus to "wep_enabled"; it's clearer and consistent with the
WPAenabled and WPA2enabled members.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6affe785

drivers/net/wireless/libertas/assoc.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int assoc_helper_wep_keys(wlan_private *priv, 
		goto out;



	/* enable/disable the MAC's WEP packet filter */

	if (assoc_req->secinfo.WEPstatus == wlan802_11WEPenabled)

	if (assoc_req->secinfo.wep_enabled)

		adapter->currentpacketfilter |= cmd_act_mac_wep_enable;

	else

		adapter->currentpacketfilter &= ~cmd_act_mac_wep_enable;

drivers/net/wireless/libertas/defs.h

+0 −6
Original line number Diff line number Diff line
@@ -276,12 +276,6 @@ enum WLAN_802_11_NETWORK_INFRASTRUCTURE { 
	wlan802_11infrastructuremax

};



/** WLAN_802_11_WEP_STATUS */

enum WLAN_802_11_WEP_STATUS {

	wlan802_11WEPenabled,

	wlan802_11WEPdisabled,

};



/** SNMP_MIB_INDEX_e */

enum SNMP_MIB_INDEX_e {

	desired_bsstype_i = 0,

drivers/net/wireless/libertas/dev.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct region_channel { 
struct wlan_802_11_security {

	u8 WPAenabled;

	u8 WPA2enabled;

	enum WLAN_802_11_WEP_STATUS WEPstatus;

	u8 wep_enabled;

	u8 auth_mode;

};

drivers/net/wireless/libertas/fw.c

+1 −2
Original line number Diff line number Diff line
@@ -194,12 +194,11 @@ static void wlan_init_adapter(wlan_private * priv) 
	adapter->scanmode = cmd_bss_type_any;



	/* 802.11 specific */

	adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;

	adapter->secinfo.wep_enabled = 0;

	for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);

	     i++)

		memset(&adapter->wep_keys[i], 0, sizeof(struct WLAN_802_11_KEY));

	adapter->wep_tx_keyidx = 0;

	adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;

	adapter->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;

	adapter->inframode = wlan802_11infrastructure;

drivers/net/wireless/libertas/join.c

+6 −7
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include "join.h"

#include "dev.h"



#define AD_HOC_CAP_PRIVACY_ON 1



/**

 *  @brief This function finds out the common rates between rate1 and rate2.

 *
@@ -683,15 +685,12 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv, 
	adhs->probedelay = cpu_to_le16(cmd_scan_probe_delay_time);



	/* set up privacy in adapter->scantable[i] */

	if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) {



#define AD_HOC_CAP_PRIVACY_ON 1

		lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus set, privacy to WEP\n");

	if (adapter->secinfo.wep_enabled) {

		lbs_pr_debug(1, "ADHOC_S_CMD: WEP enabled, setting privacy on\n");

		pbssdesc->privacy = wlan802_11privfilter8021xWEP;

		adhs->cap.privacy = AD_HOC_CAP_PRIVACY_ON;

	} else {

		lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus NOT set, Setting "

		       "privacy to ACCEPT ALL\n");

		lbs_pr_debug(1, "ADHOC_S_CMD: WEP disabled, setting privacy off\n");

		pbssdesc->privacy = wlan802_11privfilteracceptall;

	}
@@ -849,7 +848,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv, 
	padhocjoin->bssdescriptor.ssparamset.ibssparamset.atimwindow =

	    cpu_to_le16(pbssdesc->atimwindow);



	if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) {

	if (adapter->secinfo.wep_enabled) {

		padhocjoin->bssdescriptor.cap.privacy = AD_HOC_CAP_PRIVACY_ON;

	}