summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-10-09 15:04:14 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:55:22 -0700
commit04799fae8ecb42b2c687fa85fe32ff79ea0e9dc9 (patch)
tree0074cb7fed2e9f17593a25ada1568aa398223840 /drivers
parentcc32613792b9789cebb40240a56bd4a7675b86fc (diff)
downloadlinux-04799fae8ecb42b2c687fa85fe32ff79ea0e9dc9.tar.bz2
[PATCH] libertas: let get nick return what set nick has set
Make the get-nickname wireless extension actually work. Before this patch, I could do "iwconfig eth1 nick BLAH" but "iwconfig eth1" would have still showed "MRVL-USB8388" to me. Hey, and that was wrong anyway, I'm on a CF card, not on USB :-) Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-By: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/wext.c34
1 files changed, 7 insertions, 27 deletions
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 0b2103e0af57..c6f5aa3cb465 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -237,37 +237,16 @@ static int wlan_set_nick(struct net_device *dev, struct iw_request_info *info,
static int wlan_get_nick(struct net_device *dev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
- const char *cp;
- char comm[6] = { "COMM-" };
- char mrvl[6] = { "MRVL-" };
- int cnt;
+ wlan_private *priv = dev->priv;
+ wlan_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_WEXT);
- /*
- * Nick Name is not used internally in this mode,
- * therefore return something useful instead. Jean II
- */
-
- strcpy(extra, mrvl);
-
- cp = strstr(libertas_driver_version, comm);
- if (cp == libertas_driver_version) //skip leading "COMM-"
- cp = libertas_driver_version + strlen(comm);
- else
- cp = libertas_driver_version;
+ dwrq->length = strlen(adapter->nodename);
+ memcpy(extra, adapter->nodename, dwrq->length);
+ extra[dwrq->length] = '\0';
- cnt = strlen(mrvl);
- extra += cnt;
- while (cnt < 16 && (*cp != '-')) {
- *extra++ = toupper(*cp++);
- cnt++;
- }
-
- /*
- * Push it out !
- */
- dwrq->length = cnt;
+ dwrq->flags = 1; /* active */
lbs_deb_leave(LBS_DEB_WEXT);
return 0;
@@ -297,6 +276,7 @@ static int mesh_get_nick(struct net_device *dev, struct iw_request_info *info,
lbs_deb_leave(LBS_DEB_WEXT);
return 0;
}
+
static int wlan_set_rts(struct net_device *dev, struct iw_request_info *info,
struct iw_param *vwrq, char *extra)
{