lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] zd1211rw: Implement SIOCGIWNICKN

Browse Source 
wireless.h discourages using SIOCGIWNAME to publish the driver name
which the interface belongs to. Use SIOCGIWNICKN instead.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Daniel Drake
2006-07-13 17:56:16 +01:00
committed by John W. Linville
parent 67fd6b4523
commit 089f99d8ac
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/zd1211rw/zd_netdev.c
View File

@@ -72,10 +72,18 @@ static int iw_get_name(struct net_device *netdev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *req, char *extra) union iwreq_data *req, char *extra)
{ {
/* FIXME: check whether 802.11a will also supported, add also /* FIXME: check whether 802.11a will also supported */
* zd1211B, if we support it. strlcpy(req->name, "IEEE 802.11b/g", IFNAMSIZ);
*/ return 0;
strlcpy(req->name, "802.11g zd1211", IFNAMSIZ); }
static int iw_get_nick(struct net_device *netdev,
struct iw_request_info *info,
union iwreq_data *req, char *extra)
{
strcpy(extra, "zd1211");
req->data.length = strlen(extra) + 1;
req->data.flags = 1;
return 0; return 0;
} }
@@ -181,6 +189,7 @@ static int iw_get_encodeext(struct net_device *netdev,
static const iw_handler zd_standard_iw_handlers[] = { static const iw_handler zd_standard_iw_handlers[] = {
WX(SIOCGIWNAME) = iw_get_name, WX(SIOCGIWNAME) = iw_get_name,
WX(SIOCGIWNICKN) = iw_get_nick,
WX(SIOCSIWFREQ) = iw_set_freq, WX(SIOCSIWFREQ) = iw_set_freq,
WX(SIOCGIWFREQ) = iw_get_freq, WX(SIOCGIWFREQ) = iw_get_freq,
WX(SIOCSIWMODE) = iw_set_mode, WX(SIOCSIWMODE) = iw_set_mode,