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

Commit 9408c297 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] libertas: remove custom encryption mode stuff 



Remove setencryptionmode private ioctl and Encryptionmode variable.

Mostly unused, and its functionality is provided by other internal members
like WEPstatus, WPAenabled, WPA2enabled, and SIOCSIWGENIE.

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

drivers/net/wireless/libertas/cmdresp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -72,8 +72,6 @@ void libertas_mac_event_disconnected(wlan_private * priv) 
	adapter->secinfo.WPAenabled = 0;

	adapter->secinfo.WPAenabled = 0;

	adapter->secinfo.WPA2enabled = 0;

	adapter->secinfo.WPA2enabled = 0;

	adapter->wpa_ie_len = 0;

	adapter->wpa_ie_len = 0;

	adapter->secinfo.auth1xalg = WLAN_1X_AUTH_ALG_NONE;

	adapter->secinfo.Encryptionmode = CIPHER_NONE;





	adapter->connect_status = libertas_disconnected;

	adapter->connect_status = libertas_disconnected;

drivers/net/wireless/libertas/defs.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -223,15 +223,6 @@ enum SNRNF_DATA { 
	MAX_TYPE_AVG

	MAX_TYPE_AVG

};

};





/** WLAN_802_11_ENCRYPTION_MODE */

enum WLAN_802_11_ENCRYPTION_MODE {

	CIPHER_NONE,

	CIPHER_WEP40,

	CIPHER_TKIP,

	CIPHER_CCMP,

	CIPHER_WEP104,

};



/** WLAN_802_11_POWER_MODE */

/** WLAN_802_11_POWER_MODE */

enum WLAN_802_11_POWER_MODE {

enum WLAN_802_11_POWER_MODE {

	wlan802_11powermodecam,

	wlan802_11powermodecam,

drivers/net/wireless/libertas/dev.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ struct wlan_802_11_security { 
	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;

	enum WLAN_802_11_AUTHENTICATION_MODE authmode;

	enum WLAN_802_11_ENCRYPTION_MODE Encryptionmode;

};

};





/** Current Basic Service Set State Structure */

/** Current Basic Service Set State Structure */

drivers/net/wireless/libertas/fw.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -201,7 +201,6 @@ static void wlan_init_adapter(wlan_private * priv) 
	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.authmode = wlan802_11authmodeopen;

	adapter->secinfo.Encryptionmode = CIPHER_NONE;

	adapter->inframode = wlan802_11infrastructure;

	adapter->inframode = wlan802_11infrastructure;





	adapter->assoc_req = NULL;

	adapter->assoc_req = NULL;

drivers/net/wireless/libertas/ioctl.c

+0 −28
Original line number Original line Diff line number Diff line
@@ -577,30 +577,6 @@ static int wlan_set_multiple_dtim_ioctl(wlan_private * priv, struct ifreq *req) 
	return ret;

	return ret;

}

}





static int wlan_setencryptionmode_ioctl(wlan_private * priv, struct ifreq *req)

{

	int mode;

	struct iwreq *wrq = (struct iwreq *)req;



	ENTER();



	if (wrq->u.data.flags == 0) {

		//from iwpriv subcmd

		mode = SUBCMD_DATA(wrq);

	} else {

		//from wpa_supplicant subcmd

		if (copy_from_user(&mode, wrq->u.data.pointer, sizeof(int))) {

			lbs_pr_debug(1, "Copy from user failed\n");

			return -EFAULT;

		}

	}

	lbs_pr_debug(1, "encryption mode is %#x\n", mode);

	priv->adapter->secinfo.Encryptionmode = mode;



	LEAVE();

	return 0;

}



static void adjust_mtu(wlan_private * priv)

static void adjust_mtu(wlan_private * priv)

{

{

	int mtu_increment = 0;

	int mtu_increment = 0;
@@ -2002,10 +1978,6 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) 
			ret = wlan_set_multiple_dtim_ioctl(priv, req);

			ret = wlan_set_multiple_dtim_ioctl(priv, req);

			break;

			break;





		case WLANSETENCRYPTIONMODE:

			ret = wlan_setencryptionmode_ioctl(priv, req);

			break;



		case WLAN_SET_LINKMODE:

		case WLAN_SET_LINKMODE:

			ret = wlan_set_linkmode_ioctl(priv, req);

			ret = wlan_set_linkmode_ioctl(priv, req);

			break;

			break;