Skip to content

Commit

Permalink
staging: wlags49_h2: Fixup IW_AUTH handling
Browse files Browse the repository at this point in the history 
Handle more cases in IW_AUTH.

Avoid reporting errors (invalid parameter) on operations that we
can't do anything with.

Return -EINPROGRESS from some operations to get wpa_supplicant to
batch and commit changes.

In other operations apply the changes immediately.

Avoid writing WEP keys from the commit handler when WEP is not
being used.

Accept WPA_VERSION_DISABLED, which is received from wpa_supplicant
during WEP.

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
David Kilroy authored and Greg Kroah-Hartman committed Oct 17, 2011
1 parent 05df482 commit 9ef0230
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 76 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/wlags49_h2/wl_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1993,8 +1993,10 @@ int wl_put_ltv( struct wl_private *lp )
lp->ltvRecord.typ = CFG_SET_WPA_AUTH_KEY_MGMT_SUITE;
lp->ltvRecord.u.u16[0] = CNV_INT_TO_LITTLE( lp->AuthKeyMgmtSuite );
hcf_status = hcf_put_info( &lp->hcfCtx, (LTVP)&( lp->ltvRecord ));
/* WEP Keys */
wl_set_wep_keys( lp );

/* If WEP (or no) keys are being used, write (or clear) them */
if (lp->wext_enc != IW_ENCODE_ALG_TKIP)
wl_set_wep_keys(lp);

/* Country Code */
/* countryInfo, ltvCountryInfo, CFG_CNF_COUNTRY_INFO */
Expand Down
179 changes: 105 additions & 74 deletions drivers/staging/wlags49_h2/wl_wext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2894,22 +2894,40 @@ static int wireless_get_scan(struct net_device *dev, struct iw_request_info *inf
} // wireless_get_scan
/*============================================================================*/


#if DBG
static const char * const auth_names[] = {
"IW_AUTH_WPA_VERSION",
"IW_AUTH_CIPHER_PAIRWISE",
"IW_AUTH_CIPHER_GROUP",
"IW_AUTH_KEY_MGMT",
"IW_AUTH_TKIP_COUNTERMEASURES",
"IW_AUTH_DROP_UNENCRYPTED",
"IW_AUTH_80211_AUTH_ALG",
"IW_AUTH_WPA_ENABLED",
"IW_AUTH_RX_UNENCRYPTED_EAPOL",
"IW_AUTH_ROAMING_CONTROL",
"IW_AUTH_PRIVACY_INVOKED",
"IW_AUTH_CIPHER_GROUP_MGMT",
"IW_AUTH_MFP",
"Unsupported"
};
#endif

static int wireless_set_auth(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *data, char *extra)
{
struct wl_private *lp = wl_priv(dev);
unsigned long flags;
int ret;
int iwa_idx = data->flags & IW_AUTH_INDEX;
int iwa_val = data->value;
ltv_t ltv;
int ret;
int iwa_idx = data->flags & IW_AUTH_INDEX;
int iwa_val = data->value;

DBG_FUNC( "wireless_set_auth" );
DBG_ENTER( DbgInfo );

if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
if (lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY;
goto out;
}
Expand All @@ -2918,89 +2936,102 @@ static int wireless_set_auth(struct net_device *dev,

wl_act_int_off( lp );

if (iwa_idx > IW_AUTH_MFP)
iwa_idx = IW_AUTH_MFP + 1;
DBG_TRACE(DbgInfo, "%s\n", auth_names[iwa_idx]);
switch (iwa_idx) {
case IW_AUTH_WPA_VERSION:
DBG_TRACE( DbgInfo, "IW_AUTH_WPA_VERSION\n");
/* We do support WPA only; how should DISABLED be treated? */
if (iwa_val == IW_AUTH_WPA_VERSION_WPA)
ret = 0;
else
ret = -EINVAL;
break;

case IW_AUTH_WPA_ENABLED:
DBG_TRACE( DbgInfo, "IW_AUTH_WPA_ENABLED: val = %d\n", iwa_val);
if (iwa_val)
lp->EnableEncryption = 2;
else
lp->EnableEncryption = 0;
case IW_AUTH_WPA_VERSION:
/* We do support WPA */
if ((iwa_val == IW_AUTH_WPA_VERSION_WPA) ||
(iwa_val == IW_AUTH_WPA_VERSION_DISABLED))
ret = 0;
break;
else
ret = -EINVAL;
break;

case IW_AUTH_TKIP_COUNTERMEASURES:
DBG_TRACE( DbgInfo, "IW_AUTH_TKIP_COUNTERMEASURES\n");
lp->driverEnable = !iwa_val;
if(lp->driverEnable)
hcf_cntl(&(lp->hcfCtx), HCF_CNTL_ENABLE | HCF_PORT_0);
else
hcf_cntl(&(lp->hcfCtx), HCF_CNTL_DISABLE | HCF_PORT_0);
ret = 0;
break;
case IW_AUTH_WPA_ENABLED:
DBG_TRACE(DbgInfo, "val = %d\n", iwa_val);
if (iwa_val)
lp->EnableEncryption = 2;
else
lp->EnableEncryption = 0;

case IW_AUTH_DROP_UNENCRYPTED:
DBG_TRACE( DbgInfo, "IW_AUTH_DROP_UNENCRYPTED\n");
/* We do not actually do anything here, just to silence
* wpa_supplicant */
ret = 0;
break;
/* Write straight to the card */
ltv.len = 2;
ltv.typ = CFG_CNF_ENCRYPTION;
ltv.u.u16[0] = cpu_to_le16(lp->EnableEncryption);
ret = hcf_put_info(&lp->hcfCtx, (LTVP)&ltv);

case IW_AUTH_CIPHER_PAIRWISE:
DBG_TRACE( DbgInfo, "IW_AUTH_CIPHER_PAIRWISE\n");
/* not implemented, return an error */
ret = -EINVAL;
break;
break;

case IW_AUTH_CIPHER_GROUP:
DBG_TRACE( DbgInfo, "IW_AUTH_CIPHER_GROUP\n");
/* not implemented, return an error */
ret = -EINVAL;
break;
case IW_AUTH_TKIP_COUNTERMEASURES:

case IW_AUTH_KEY_MGMT:
DBG_TRACE( DbgInfo, "IW_AUTH_KEY_MGMT\n");
/* not implemented, return an error */
ret = -EINVAL;
break;
/* Immediately disable card */
lp->driverEnable = !iwa_val;
if (lp->driverEnable)
hcf_cntl(&(lp->hcfCtx), HCF_CNTL_ENABLE | HCF_PORT_0);
else
hcf_cntl(&(lp->hcfCtx), HCF_CNTL_DISABLE | HCF_PORT_0);
ret = 0;
break;

case IW_AUTH_80211_AUTH_ALG:
DBG_TRACE( DbgInfo, "IW_AUTH_80211_AUTH_ALG\n");
/* not implemented, return an error */
case IW_AUTH_MFP:
/* Management Frame Protection not supported.
* Only fail if set to required.
*/
if (iwa_val == IW_AUTH_MFP_REQUIRED)
ret = -EINVAL;
break;
else
ret = 0;
break;

case IW_AUTH_RX_UNENCRYPTED_EAPOL:
DBG_TRACE( DbgInfo, "IW_AUTH_RX_UNENCRYPTED_EAPOL\n");
/* not implemented, return an error */
ret = -EINVAL;
break;
case IW_AUTH_KEY_MGMT:

case IW_AUTH_ROAMING_CONTROL:
DBG_TRACE( DbgInfo, "IW_AUTH_ROAMING_CONTROL\n");
/* not implemented, return an error */
ret = -EINVAL;
break;
/* Record required management suite.
* Will take effect on next commit */
if (iwa_val != 0)
lp->AuthKeyMgmtSuite = 4;
else
lp->AuthKeyMgmtSuite = 0;

case IW_AUTH_PRIVACY_INVOKED:
DBG_TRACE( DbgInfo, "IW_AUTH_PRIVACY_INVOKED\n");
/* not implemented, return an error */
ret = -EINVAL;
break;
ret = -EINPROGRESS;
break;

default:
DBG_TRACE( DbgInfo, "IW_AUTH_?? (%d) unknown\n", iwa_idx);
/* return an error */
case IW_AUTH_80211_AUTH_ALG:

/* Just record whether open or shared is required.
* Will take effect on next commit */
ret = -EINPROGRESS;

if (iwa_val & IW_AUTH_ALG_SHARED_KEY)
lp->authentication = 1;
else if (iwa_val & IW_AUTH_ALG_OPEN_SYSTEM)
lp->authentication = 0;
else
ret = -EINVAL;
break;
break;

case IW_AUTH_DROP_UNENCRYPTED:
/* Only needed for AP */
lp->ExcludeUnencrypted = iwa_val;
ret = -EINPROGRESS;
break;

case IW_AUTH_CIPHER_PAIRWISE:
case IW_AUTH_CIPHER_GROUP:
case IW_AUTH_RX_UNENCRYPTED_EAPOL:
case IW_AUTH_ROAMING_CONTROL:
case IW_AUTH_PRIVACY_INVOKED:
/* Not used. May need to do something with
* CIPHER_PAIRWISE and CIPHER_GROUP*/
ret = -EINPROGRESS;
break;

default:
DBG_TRACE(DbgInfo, "IW_AUTH_?? (%d) unknown\n", iwa_idx);
/* return an error */
ret = -EOPNOTSUPP;
break;
}

wl_act_int_on( lp );
Expand Down

0 comments on commit 9ef0230

Please sign in to comment.