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

Commit 6affe785 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] libertas: remove WLAN_802_11_AUTHENTICATION_MODE 



Remove WLAN_802_11_AUTHENTICATION_MODE enum and use IW_AUTH_ALG_* instead.

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

drivers/net/wireless/libertas/assoc.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -300,8 +300,7 @@ static int should_deauth_infrastructure(wlan_adapter *adapter, 
	}

	}





	if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {

	if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {

		if (adapter->secinfo.authmode !=

		if (adapter->secinfo.auth_mode != assoc_req->secinfo.auth_mode) {

		    assoc_req->secinfo.authmode) {

			lbs_pr_debug(1, "Deauthenticating due to updated security "

			lbs_pr_debug(1, "Deauthenticating due to updated security "

				"info in configuration request.\n");

				"info in configuration request.\n");

			return 1;

			return 1;

drivers/net/wireless/libertas/defs.h

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

	wlan802_11infrastructuremax

};

};





/** WLAN_802_11_AUTHENTICATION_MODE */

enum WLAN_802_11_AUTHENTICATION_MODE {

	wlan802_11authmodeopen = 0x00,

	wlan802_11authmodeshared = 0x01,

	wlan802_11authmodenetworkEAP = 0x80,

};



/** WLAN_802_11_WEP_STATUS */

/** WLAN_802_11_WEP_STATUS */

enum WLAN_802_11_WEP_STATUS {

enum WLAN_802_11_WEP_STATUS {

	wlan802_11WEPenabled,

	wlan802_11WEPenabled,

drivers/net/wireless/libertas/dev.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ struct wlan_802_11_security { 
	u8 WPAenabled;

	u8 WPAenabled;

	u8 WPA2enabled;

	u8 WPA2enabled;

	enum WLAN_802_11_WEP_STATUS WEPstatus;

	enum WLAN_802_11_WEP_STATUS WEPstatus;

	enum WLAN_802_11_AUTHENTICATION_MODE authmode;

	u8 auth_mode;

};

};





/** Current Basic Service Set State Structure */

/** Current Basic Service Set State Structure */

drivers/net/wireless/libertas/fw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -200,7 +200,7 @@ static void wlan_init_adapter(wlan_private * priv) 
		memset(&adapter->wep_keys[i], 0, sizeof(struct WLAN_802_11_KEY));

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

	adapter->wep_tx_keyidx = 0;

	adapter->wep_tx_keyidx = 0;

	adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;

	adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;

	adapter->secinfo.authmode = wlan802_11authmodeopen;

	adapter->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;

	adapter->inframode = wlan802_11infrastructure;

	adapter->inframode = wlan802_11infrastructure;





	adapter->assoc_req = NULL;

	adapter->assoc_req = NULL;

drivers/net/wireless/libertas/join.c

+24 −7
Original line number Original line Diff line number Diff line
@@ -398,22 +398,39 @@ int libertas_cmd_80211_authenticate(wlan_private * priv, 
				 void *pdata_buf)

				 void *pdata_buf)

{

{

	wlan_adapter *adapter = priv->adapter;

	wlan_adapter *adapter = priv->adapter;

	struct cmd_ds_802_11_authenticate *pauthenticate =

	struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth;

	    &cmd->params.auth;

	int ret = -1;

	u8 *bssid = pdata_buf;

	u8 *bssid = pdata_buf;





	cmd->command = cpu_to_le16(cmd_802_11_authenticate);

	cmd->command = cpu_to_le16(cmd_802_11_authenticate);

	cmd->size =

	cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_authenticate)

	    cpu_to_le16(sizeof(struct cmd_ds_802_11_authenticate)

	                        + S_DS_GEN);

	                        + S_DS_GEN);





	pauthenticate->authtype = adapter->secinfo.authmode;

	/* translate auth mode to 802.11 defined wire value */

	switch (adapter->secinfo.auth_mode) {

	case IW_AUTH_ALG_OPEN_SYSTEM:

		pauthenticate->authtype = 0x00;

		break;

	case IW_AUTH_ALG_SHARED_KEY:

		pauthenticate->authtype = 0x01;

		break;

	case IW_AUTH_ALG_LEAP:

		pauthenticate->authtype = 0x80;

		break;

	default:

		lbs_pr_debug(1, "AUTH_CMD: invalid auth alg 0x%X\n",

		             adapter->secinfo.auth_mode);

		goto out;

	}



	memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);

	memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);





	lbs_pr_debug(1, "AUTH_CMD: Bssid is : %x:%x:%x:%x:%x:%x\n",

	lbs_pr_debug(1, "AUTH_CMD: Bssid is : %x:%x:%x:%x:%x:%x\n",

	       bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);

	       bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);

	ret = 0;





	return 0;

out:

	return ret;

}

}





int libertas_cmd_80211_deauthenticate(wlan_private * priv,

int libertas_cmd_80211_deauthenticate(wlan_private * priv,