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

Commit cbbdd03f authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ipw2100: Add LEAP authentication algorithm support 



Signed-off-by: default avatarHong Liu <hong.liu@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9eafe76b

drivers/net/wireless/ipw2100.c

+9 −3
Original line number Diff line number Diff line
@@ -5365,9 +5365,12 @@ static int ipw2100_configure_security(struct ipw2100_priv *priv, int batch_mode) 
						     SEC_LEVEL_0, 0, 1);

	} else {

		auth_mode = IPW_AUTH_OPEN;

		if ((priv->ieee->sec.flags & SEC_AUTH_MODE) &&

		    (priv->ieee->sec.auth_mode == WLAN_AUTH_SHARED_KEY))

		if (priv->ieee->sec.flags & SEC_AUTH_MODE) {

			if (priv->ieee->sec.auth_mode == WLAN_AUTH_SHARED_KEY)

				auth_mode = IPW_AUTH_SHARED;

			else if (priv->ieee->sec.auth_mode == WLAN_AUTH_LEAP)

				auth_mode = IPW_AUTH_LEAP_CISCO_ID;

		}



		sec_level = SEC_LEVEL_0;

		if (priv->ieee->sec.flags & SEC_LEVEL)
@@ -5760,6 +5763,9 @@ static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value) 
	} else if (value & IW_AUTH_ALG_OPEN_SYSTEM) {

		sec.auth_mode = WLAN_AUTH_OPEN;

		ieee->open_wep = 1;

	} else if (value & IW_AUTH_ALG_LEAP) {

		sec.auth_mode = WLAN_AUTH_LEAP;

		ieee->open_wep = 1;

	} else

		return -EINVAL;

drivers/net/wireless/ipw2100.h

+4 −2
Original line number Diff line number Diff line
@@ -394,6 +394,8 @@ struct ipw2100_notification { 


#define	IPW_AUTH_OPEN     	0

#define	IPW_AUTH_SHARED   	1

#define IPW_AUTH_LEAP	  	2

#define IPW_AUTH_LEAP_CISCO_ID	0x80



struct statistic {

	int value;