mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
[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>
This commit is contained in:
parent
cc32613792
commit
04799fae8e
1 changed files with 7 additions and 27 deletions
|
@ -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
|
||||
*/
|
||||
dwrq->length = strlen(adapter->nodename);
|
||||
memcpy(extra, adapter->nodename, dwrq->length);
|
||||
extra[dwrq->length] = '\0';
|
||||
|
||||
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;
|
||||
|
||||
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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue