diff options
| -rw-r--r-- | at76_usb.c | 33 | ||||
| -rw-r--r-- | at76_usb.h | 1 |
2 files changed, 0 insertions, 34 deletions
@@ -5129,36 +5129,6 @@ static int at76_iw_handler_get_essid(struct net_device *netdev, return 0; } -static int at76_iw_handler_set_nickname(struct net_device *netdev, - struct iw_request_info *info, - struct iw_point *data, char *extra) -{ - struct at76_priv *dev = netdev_priv(netdev); - - at76_dbg(DBG_IOCTL, "%s: SIOCSIWNICKN - %s", netdev->name, extra); - - /* iwconfig gives length including 0 byte like in the case of essid */ - memcpy(dev->nickn, extra, data->length); - - return 0; -} - -static int at76_iw_handler_get_nickname(struct net_device *netdev, - struct iw_request_info *info, - struct iw_point *data, char *extra) -{ - struct at76_priv *dev = netdev_priv(netdev); - - data->length = strlen(dev->nickn); - memcpy(extra, dev->nickn, data->length); - extra[data->length] = '\0'; - data->length += 1; - - at76_dbg(DBG_IOCTL, "%s: SIOCGIWNICKN - %s", netdev->name, extra); - - return 0; -} - static int at76_iw_handler_set_rate(struct net_device *netdev, struct iw_request_info *info, struct iw_param *bitrate, char *extra) @@ -5765,8 +5735,6 @@ static const iw_handler at76_handlers[] = [SIOCGIWSCAN -SIOCIWFIRST] = (iw_handler) at76_iw_handler_get_scan, [SIOCSIWESSID -SIOCIWFIRST] = (iw_handler) at76_iw_handler_set_essid, [SIOCGIWESSID -SIOCIWFIRST] = (iw_handler) at76_iw_handler_get_essid, - [SIOCSIWNICKN -SIOCIWFIRST] = (iw_handler) at76_iw_handler_set_nickname, - [SIOCGIWNICKN -SIOCIWFIRST] = (iw_handler) at76_iw_handler_get_nickname, [SIOCSIWRATE -SIOCIWFIRST] = (iw_handler) at76_iw_handler_set_rate, [SIOCGIWRATE -SIOCIWFIRST] = (iw_handler) at76_iw_handler_get_rate, [SIOCSIWRTS -SIOCIWFIRST] = (iw_handler) at76_iw_handler_set_rts, @@ -6106,7 +6074,6 @@ static int at76_init_new_device(struct at76_priv *dev) dev->iw_mode = default_iw_mode; dev->monitor_prism_header = 1; memset(dev->essid, 0, IW_ESSID_MAX_SIZE); - memset(dev->nickn, 0, sizeof(dev->nickn)); dev->rts_threshold = DEF_RTS_THRESHOLD; dev->frag_threshold = DEF_FRAG_THRESHOLD; dev->short_retry_limit = DEF_SHORT_RETRY_LIMIT; @@ -503,7 +503,6 @@ struct at76_priv { int iw_mode; u8 bssid[ETH_ALEN]; u8 essid[IW_ESSID_MAX_SIZE]; - char nickn[IW_ESSID_MAX_SIZE + 1]; /* nickname, only used in the iwconfig i/f */ int essid_size; int radio_on; int promisc; |