Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149978
b: refs/heads/master
c: 314bd75
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Apr 22, 2009
1 parent e620656 commit 383e2bc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 39 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d323655372590c533c275b1d798f9d1221efb5c6
refs/heads/master: 314bd7503b1e96841931311f28a8925dab66ed83
38 changes: 0 additions & 38 deletions trunk/drivers/net/wireless/rndis_wlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,6 @@ struct rndis_wext_private {
struct iw_statistics iwstats;
struct iw_statistics privstats;

int nick_len;
char nick[32];

int caps;
int multicast_size;

Expand Down Expand Up @@ -1798,39 +1795,6 @@ static int rndis_iw_get_frag(struct net_device *dev,
}


static int rndis_iw_set_nick(struct net_device *dev,
struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
{
struct usbnet *usbdev = netdev_priv(dev);
struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

devdbg(usbdev, "SIOCSIWNICK");

priv->nick_len = wrqu->data.length;
if (priv->nick_len > 32)
priv->nick_len = 32;

memcpy(priv->nick, extra, priv->nick_len);
return 0;
}


static int rndis_iw_get_nick(struct net_device *dev,
struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
{
struct usbnet *usbdev = netdev_priv(dev);
struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

wrqu->data.flags = 1;
wrqu->data.length = priv->nick_len;
memcpy(extra, priv->nick, priv->nick_len);

devdbg(usbdev, "SIOCGIWNICK: '%s'", priv->nick);

return 0;
}


static int rndis_iw_set_freq(struct net_device *dev,
struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
{
Expand Down Expand Up @@ -2039,8 +2003,6 @@ static const iw_handler rndis_iw_handler[] =
IW_IOCTL(SIOCGIWSCAN) = (iw_handler) cfg80211_wext_giwscan,
IW_IOCTL(SIOCSIWESSID) = rndis_iw_set_essid,
IW_IOCTL(SIOCGIWESSID) = rndis_iw_get_essid,
IW_IOCTL(SIOCSIWNICKN) = rndis_iw_set_nick,
IW_IOCTL(SIOCGIWNICKN) = rndis_iw_get_nick,
IW_IOCTL(SIOCGIWRATE) = rndis_iw_get_rate,
IW_IOCTL(SIOCSIWRTS) = rndis_iw_set_rts,
IW_IOCTL(SIOCGIWRTS) = rndis_iw_get_rts,
Expand Down

0 comments on commit 383e2bc

Please sign in to comment.