diff options
author | Jens Muecke <jens@nons.de> | 2008-01-24 03:03:04 +0000 |
---|---|---|
committer | Jens Muecke <jens@nons.de> | 2008-01-24 03:03:04 +0000 |
commit | 3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa (patch) | |
tree | 12be7757f7f03efb1eeb53266dc48496b0d99b2f /package/libertas/src/wext.c | |
parent | 8ee2e7a4a3161b73949836276e5fd847c44f1c10 (diff) | |
download | upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.tar.gz upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.tar.bz2 upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.zip |
Updating libertas wireless driver to latest version.
SVN-Revision: 10235
Diffstat (limited to 'package/libertas/src/wext.c')
-rw-r--r-- | package/libertas/src/wext.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/libertas/src/wext.c b/package/libertas/src/wext.c index 262d4cc580..3e8d555ba3 100644 --- a/package/libertas/src/wext.c +++ b/package/libertas/src/wext.c @@ -734,6 +734,13 @@ static int lbs_set_power(struct net_device *dev, struct iw_request_info *info, lbs_deb_enter(LBS_DEB_WEXT); + if (!priv->ps_supported) { + if (vwrq->disabled) + return 0; + else + return -EINVAL; + } + /* PS is currently supported only in Infrastructure mode * Remove this check if it is to be supported in IBSS mode also */ @@ -1000,9 +1007,8 @@ static int lbs_mesh_set_freq(struct net_device *dev, else if (priv->mode == IW_MODE_ADHOC) lbs_stop_adhoc_network(priv); } - priv->curbssparams.channel = fwrq->m; - lbs_mesh_config(priv, 0); - lbs_mesh_config(priv, 1); + lbs_mesh_config(priv, 1, fwrq->m); + lbs_update_channel(priv); ret = 0; out: @@ -2010,7 +2016,7 @@ static int lbs_mesh_set_essid(struct net_device *dev, priv->mesh_ssid_len = dwrq->length; } - lbs_mesh_config(priv, 1); + lbs_mesh_config(priv, 1, priv->curbssparams.channel); out: lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret); return ret; |