diff options
| author |   David Kilroy <kilroyd@googlemail.com> | 2011-10-09 12:11:37 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-17 15:22:38 -0700 |
| commit | 729336b3267aa50011ec32574f88f1c3e6fee844 (patch) | |
| tree | 7c5b490963f56e3f339a10a04e0e3eb322b5b346 /drivers/staging/wlags49_h2/wl_wext.c | |
| parent | staging: wlags49_h2: Fixup IW_AUTH handling (diff) | |
| download | linux-dev-729336b3267aa50011ec32574f88f1c3e6fee844.tar.xz linux-dev-729336b3267aa50011ec32574f88f1c3e6fee844.zip | |
staging: wlags49_h2: Fixup SIOCSIWGENIE
Setting the key management scheme is done in SIOCSIWAUTH, so
no need to do anything in SIOCSIWGENIE.
Fix up function name.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_wext.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_wext.c | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 98843209536c..8ac5e1081aa0 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c @@ -3196,42 +3196,20 @@ out: -static int wireless_get_genie(struct net_device *dev, - struct iw_request_info *info, - struct iw_point *data, char *extra) +static int wireless_set_genie(struct net_device *dev, + struct iw_request_info *info, + struct iw_point *data, char *extra) { - struct wl_private *lp = wl_priv(dev); - unsigned long flags; int ret = 0; - ltv_t ltv; - - DBG_FUNC( "wireless_get_genie" ); - DBG_ENTER( DbgInfo ); - - if(lp->portState == WVLAN_PORT_STATE_DISABLED) { - ret = -EBUSY; - goto out; - } - - wl_lock( lp, &flags ); - wl_act_int_off( lp ); - - memset(<v, 0, sizeof(ltv)); - ltv.len = 2; - ltv.typ = CFG_SET_WPA_AUTH_KEY_MGMT_SUITE; - lp->AuthKeyMgmtSuite = ltv.u.u16[0] = 4; - ltv.u.u16[0] = CNV_INT_TO_LITTLE(ltv.u.u16[0]); - - ret = hcf_put_info(&(lp->hcfCtx), (LTVP)<v); - - wl_act_int_on( lp ); + DBG_ENTER(DbgInfo); - wl_unlock(lp, &flags); + /* We can't write this to the card, but apparently this + * operation needs to succeed */ + ret = 0; -out: - DBG_LEAVE( DbgInfo ); + DBG_LEAVE(DbgInfo); return ret; } /*============================================================================*/ @@ -3970,7 +3948,7 @@ static const iw_handler wl_handler[] = IW_HANDLER(SIOCGIWENCODE, (iw_handler) wireless_get_encode), IW_HANDLER(SIOCSIWPOWER, (iw_handler) wireless_set_power), IW_HANDLER(SIOCGIWPOWER, (iw_handler) wireless_get_power), - IW_HANDLER(SIOCSIWGENIE, (iw_handler) wireless_get_genie), + IW_HANDLER(SIOCSIWGENIE, (iw_handler) wireless_set_genie), IW_HANDLER(SIOCSIWAUTH, (iw_handler) wireless_set_auth), IW_HANDLER(SIOCSIWENCODEEXT, (iw_handler) wireless_set_encodeext), }; |