Skip to content

Commit

Permalink
staging: wlags49_h2: Fixup SIOCSIWGENIE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Kilroy authored and Greg Kroah-Hartman committed Oct 17, 2011
1 parent 9ef0230 commit 729336b
Showing 1 changed file with 9 additions and 31 deletions.
40 changes: 9 additions & 31 deletions drivers/staging/wlags49_h2/wl_wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -3196,42 +3196,20 @@ static int wireless_set_encodeext(struct net_device *dev,



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(&ltv, 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)&ltv);

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;
}
/*============================================================================*/
Expand Down Expand Up @@ -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),
};
Expand Down

0 comments on commit 729336b

Please sign in to comment.