diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 13:30:20 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 13:30:20 +0200 |
| commit | e7549b926dd3ceec048f5689df90d4ec970c9419 (patch) | |
| tree | c8645e0b4343c309aac1a3838a17cfcf0893d7b5 /drivers/staging/wlags49_h2/wl_main.c | |
| parent | 499ba610c2829adafbf393c2f3773d73ae4445f3 (diff) | |
| download | kernel_samsung_smdk4412-e7549b926dd3ceec048f5689df90d4ec970c9419.zip kernel_samsung_smdk4412-e7549b926dd3ceec048f5689df90d4ec970c9419.tar.gz kernel_samsung_smdk4412-e7549b926dd3ceec048f5689df90d4ec970c9419.tar.bz2 | |
more driver stuff from 3.2.72
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_main.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c index 6d45ab3..483eee1 100644 --- a/drivers/staging/wlags49_h2/wl_main.c +++ b/drivers/staging/wlags49_h2/wl_main.c @@ -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 */ |