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

Commit 1d42b8f2 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] libertas: remove 8021xauthalgs private ioctl 



Useless; it set an internal variable that was unused anyway.
A supplicant handles all 802.1x authentication, not the driver.

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

drivers/net/wireless/libertas/defs.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -230,15 +230,6 @@ enum WLAN_802_11_AUTH_ALG { 
	AUTH_ALG_NETWORK_EAP = 8,

	AUTH_ALG_NETWORK_EAP = 8,

};

};





/** WLAN_802_1X_AUTH_ALG */

enum WLAN_802_1X_AUTH_ALG {

	WLAN_1X_AUTH_ALG_NONE = 1,

	WLAN_1X_AUTH_ALG_LEAP = 2,

	WLAN_1X_AUTH_ALG_TLS = 4,

	WLAN_1X_AUTH_ALG_TTLS = 8,

	WLAN_1X_AUTH_ALG_MD5 = 16,

};



/** WLAN_802_11_ENCRYPTION_MODE */

/** WLAN_802_11_ENCRYPTION_MODE */

enum WLAN_802_11_ENCRYPTION_MODE {

enum WLAN_802_11_ENCRYPTION_MODE {

	CIPHER_NONE,

	CIPHER_NONE,

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_1X_AUTH_ALG auth1xalg;

	enum WLAN_802_11_ENCRYPTION_MODE Encryptionmode;

	enum WLAN_802_11_ENCRYPTION_MODE Encryptionmode;

};

};

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.auth1xalg = WLAN_1X_AUTH_ALG_NONE;

	adapter->secinfo.Encryptionmode = CIPHER_NONE;

	adapter->secinfo.Encryptionmode = CIPHER_NONE;

	adapter->inframode = wlan802_11infrastructure;

	adapter->inframode = wlan802_11infrastructure;

drivers/net/wireless/libertas/ioctl.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -618,32 +618,6 @@ static int wlan_setauthalg_ioctl(wlan_private * priv, struct ifreq *req) 
	return 0;

	return 0;

}

}





/**

 *  @brief Set 802.1x authentication mode

 *  @param priv                 A pointer to wlan_private structure

 *  @param req			A pointer to ifreq structure

 *  @return 	   		0 --success, otherwise fail

 */

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

{

	int alg;

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



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

		//from iwpriv subcmd

		alg = SUBCMD_DATA(wrq);

	} else {

		//from wpa_supplicant subcmd

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

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

			return -EFAULT;

		}

	}

	lbs_pr_debug(1, "802.1x auth alg is %#x\n", alg);

	priv->adapter->secinfo.auth1xalg = alg;

	return 0;

}



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

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

{

{

	int mode;

	int mode;
@@ -2073,10 +2047,6 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) 
			ret = wlan_setauthalg_ioctl(priv, req);

			ret = wlan_setauthalg_ioctl(priv, req);

			break;

			break;





		case WLANSET8021XAUTHALG:

			ret = wlan_set8021xauthalg_ioctl(priv, req);

			break;



		case WLANSETENCRYPTIONMODE:

		case WLANSETENCRYPTIONMODE:

			ret = wlan_setencryptionmode_ioctl(priv, req);

			ret = wlan_setencryptionmode_ioctl(priv, req);

			break;

			break;

drivers/net/wireless/libertas/wext.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1087,12 +1087,6 @@ static const struct iw_priv_args wlan_private_args[] = { 
	 IW_PRIV_TYPE_NONE,

	 IW_PRIV_TYPE_NONE,

	 "authalgs",

	 "authalgs",

	 },

	 },

	{

	 WLANSET8021XAUTHALG,

	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,

	 IW_PRIV_TYPE_NONE,

	 "8021xauthalgs",

	 },

	{

	{

	 WLANSETENCRYPTIONMODE,

	 WLANSETENCRYPTIONMODE,

	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,

	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,