[PATCH] libertas: sparse fixes
[cascardo/linux.git] / drivers / net / wireless / libertas / ioctl.c
index 82b3964..a8f76c3 100644 (file)
 
 #define WAIT_FOR_SCAN_RRESULT_MAX_TIME (10 * HZ)
 
-static int setrxantenna(wlan_private * priv, int mode)
-{
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-
-       if (mode != RF_ANTENNA_1 && mode != RF_ANTENNA_2
-           && mode != RF_ANTENNA_AUTO) {
-               return -EINVAL;
-       }
-
-       adapter->rxantennamode = mode;
-
-       lbs_pr_debug(1, "SET RX Antenna mode to 0x%04x\n", adapter->rxantennamode);
-
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                   cmd_act_set_rx,
-                                   cmd_option_waitforrsp, 0,
-                                   &adapter->rxantennamode);
-       return ret;
-}
-
-static int settxantenna(wlan_private * priv, int mode)
-{
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-
-       if ((mode != RF_ANTENNA_1) && (mode != RF_ANTENNA_2)
-           && (mode != RF_ANTENNA_AUTO)) {
-               return -EINVAL;
-       }
-
-       adapter->txantennamode = mode;
-
-       lbs_pr_debug(1, "SET TX Antenna mode to 0x%04x\n", adapter->txantennamode);
-
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                   cmd_act_set_tx,
-                                   cmd_option_waitforrsp, 0,
-                                   &adapter->txantennamode);
-
-       return ret;
-}
-
-static int getrxantenna(wlan_private * priv, char *buf)
-{
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-
-       // clear it, so we will know if the value
-       // returned below is correct or not.
-       adapter->rxantennamode = 0;
-
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                   cmd_act_get_rx,
-                                   cmd_option_waitforrsp, 0, NULL);
-
-       if (ret) {
-               LEAVE();
-               return ret;
-       }
-
-       lbs_pr_debug(1, "Get Rx Antenna mode:0x%04x\n", adapter->rxantennamode);
-
-       return sprintf(buf, "0x%04x", adapter->rxantennamode) + 1;
-}
-
-static int gettxantenna(wlan_private * priv, char *buf)
-{
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-
-       // clear it, so we will know if the value
-       // returned below is correct or not.
-       adapter->txantennamode = 0;
-
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                   cmd_act_get_tx,
-                                   cmd_option_waitforrsp, 0, NULL);
-
-       if (ret) {
-               LEAVE();
-               return ret;
-       }
-
-       lbs_pr_debug(1, "Get Tx Antenna mode:0x%04x\n", adapter->txantennamode);
-
-       return sprintf(buf, "0x%04x", adapter->txantennamode) + 1;
-}
-
-static int wlan_set_region(wlan_private * priv, u16 region_code)
-{
-       int i;
-
-       for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
-               // use the region code to search for the index
-               if (region_code == libertas_region_code_to_index[i]) {
-                       priv->adapter->regiontableindex = (u16) i;
-                       priv->adapter->regioncode = region_code;
-                       break;
-               }
-       }
-
-       // if it's unidentified region code
-       if (i >= MRVDRV_MAX_REGION_CODE) {
-               lbs_pr_debug(1, "region Code not identified\n");
-               LEAVE();
-               return -1;
-       }
-
-       if (libertas_set_regiontable(priv, priv->adapter->regioncode, 0)) {
-               LEAVE();
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-/**
- *  @brief Get/Set Firmware wakeup method
- *
- *  @param priv                A pointer to wlan_private structure
- *  @param wrq         A pointer to user data
- *  @return            0--success, otherwise fail
- */
-static int wlan_txcontrol(wlan_private * priv, struct iwreq *wrq)
-{
-       wlan_adapter *adapter = priv->adapter;
-       int data;
-       ENTER();
-
-       if ((int)wrq->u.data.length == 0) {
-               if (copy_to_user
-                   (wrq->u.data.pointer, &adapter->pkttxctrl, sizeof(u32))) {
-                       lbs_pr_alert("copy_to_user failed!\n");
-                       return -EFAULT;
-               }
-       } else {
-               if ((int)wrq->u.data.length > 1) {
-                       lbs_pr_alert("ioctl too many args!\n");
-                       return -EFAULT;
-               }
-               if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
-                       lbs_pr_alert("Copy from user failed\n");
-                       return -EFAULT;
-               }
-
-               adapter->pkttxctrl = (u32) data;
-       }
-
-       wrq->u.data.length = 1;
-
-       LEAVE();
-       return 0;
-}
-
-/**
- *  @brief Get/Set NULL Package generation interval
- *
- *  @param priv                A pointer to wlan_private structure
- *  @param wrq         A pointer to user data
- *  @return            0--success, otherwise fail
- */
-static int wlan_null_pkt_interval(wlan_private * priv, struct iwreq *wrq)
-{
-       wlan_adapter *adapter = priv->adapter;
-       int data;
-       ENTER();
-
-       if ((int)wrq->u.data.length == 0) {
-               data = adapter->nullpktinterval;
-
-               if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) {
-                       lbs_pr_alert( "copy_to_user failed!\n");
-                       return -EFAULT;
-               }
-       } else {
-               if ((int)wrq->u.data.length > 1) {
-                       lbs_pr_alert( "ioctl too many args!\n");
-                       return -EFAULT;
-               }
-               if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
-                       lbs_pr_debug(1, "Copy from user failed\n");
-                       return -EFAULT;
-               }
-
-               adapter->nullpktinterval = data;
-       }
-
-       wrq->u.data.length = 1;
-
-       LEAVE();
-       return 0;
-}
-
-static int wlan_get_rxinfo(wlan_private * priv, struct iwreq *wrq)
-{
-       wlan_adapter *adapter = priv->adapter;
-       int data[2];
-       ENTER();
-       data[0] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
-       data[1] = adapter->rxpd_rate;
-       if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 2)) {
-               lbs_pr_debug(1, "Copy to user failed\n");
-               return -EFAULT;
-       }
-       wrq->u.data.length = 2;
-       LEAVE();
-       return 0;
-}
-
-static int wlan_get_snr(wlan_private * priv, struct iwreq *wrq)
-{
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-       int data[4];
-
-       ENTER();
-       memset(data, 0, sizeof(data));
-       if (wrq->u.data.length) {
-               if (copy_from_user(data, wrq->u.data.pointer,
-                    min_t(size_t, wrq->u.data.length, 4) * sizeof(int)))
-                       return -EFAULT;
-       }
-       if ((wrq->u.data.length == 0) || (data[0] == 0) || (data[0] == 1)) {
-               if (adapter->connect_status == libertas_connected) {
-                       ret = libertas_prepare_and_send_command(priv,
-                                                   cmd_802_11_rssi,
-                                                   0,
-                                                   cmd_option_waitforrsp,
-                                                   0, NULL);
-
-                       if (ret) {
-                               LEAVE();
-                               return ret;
-                       }
-               }
-       }
-
-       if (wrq->u.data.length == 0) {
-               data[0] = adapter->SNR[TYPE_BEACON][TYPE_NOAVG];
-               data[1] = adapter->SNR[TYPE_BEACON][TYPE_AVG];
-               data[2] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
-               data[3] = adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-               if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 4))
-                       return -EFAULT;
-               wrq->u.data.length = 4;
-       } else if (data[0] == 0) {
-               data[0] = adapter->SNR[TYPE_BEACON][TYPE_NOAVG];
-               if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                       return -EFAULT;
-               wrq->u.data.length = 1;
-       } else if (data[0] == 1) {
-               data[0] = adapter->SNR[TYPE_BEACON][TYPE_AVG];
-               if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                       return -EFAULT;
-               wrq->u.data.length = 1;
-       } else if (data[0] == 2) {
-               data[0] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
-               if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                       return -EFAULT;
-               wrq->u.data.length = 1;
-       } else if (data[0] == 3) {
-               data[0] = adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-               if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                       return -EFAULT;
-               wrq->u.data.length = 1;
-       } else
-               return -ENOTSUPP;
-
-       LEAVE();
-       return 0;
-}
-
-static int wlan_beacon_interval(wlan_private * priv, struct iwreq *wrq)
-{
-       int data;
-       wlan_adapter *adapter = priv->adapter;
-
-       if (wrq->u.data.length > 0) {
-               if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int)))
-                       return -EFAULT;
-
-               lbs_pr_debug(1, "WLAN SET BEACON INTERVAL: %d\n", data);
-               if ((data > MRVDRV_MAX_BEACON_INTERVAL)
-                   || (data < MRVDRV_MIN_BEACON_INTERVAL))
-                       return -ENOTSUPP;
-               adapter->beaconperiod = data;
-       }
-       data = adapter->beaconperiod;
-       if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int)))
-               return -EFAULT;
-
-       wrq->u.data.length = 1;
-
-       return 0;
-}
-
-static int wlan_get_rssi(wlan_private * priv, struct iwreq *wrq)
-{
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-       int temp;
-       int data = 0;
-       int *val;
-
-       ENTER();
-       data = SUBCMD_DATA(wrq);
-       if ((data == 0) || (data == 1)) {
-               ret = libertas_prepare_and_send_command(priv,
-                                           cmd_802_11_rssi,
-                                           0, cmd_option_waitforrsp,
-                                           0, NULL);
-               if (ret) {
-                       LEAVE();
-                       return ret;
-               }
-       }
-
-       switch (data) {
-       case 0:
-
-               temp = CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_NOAVG],
-                               adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
-               break;
-       case 1:
-               temp = CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_AVG],
-                               adapter->NF[TYPE_BEACON][TYPE_AVG]);
-               break;
-       case 2:
-               temp = CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_NOAVG],
-                               adapter->NF[TYPE_RXPD][TYPE_NOAVG]);
-               break;
-       case 3:
-               temp = CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
-                               adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
-               break;
-       default:
-               return -ENOTSUPP;
-       }
-       val = (int *)wrq->u.name;
-       *val = temp;
-
-       LEAVE();
-       return 0;
-}
-
-static int wlan_get_nf(wlan_private * priv, struct iwreq *wrq)
-{
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-       int temp;
-       int data = 0;
-       int *val;
-
-       data = SUBCMD_DATA(wrq);
-       if ((data == 0) || (data == 1)) {
-               ret = libertas_prepare_and_send_command(priv,
-                                           cmd_802_11_rssi,
-                                           0, cmd_option_waitforrsp,
-                                           0, NULL);
-
-               if (ret) {
-                       LEAVE();
-                       return ret;
-               }
-       }
-
-       switch (data) {
-       case 0:
-               temp = adapter->NF[TYPE_BEACON][TYPE_NOAVG];
-               break;
-       case 1:
-               temp = adapter->NF[TYPE_BEACON][TYPE_AVG];
-               break;
-       case 2:
-               temp = adapter->NF[TYPE_RXPD][TYPE_NOAVG];
-               break;
-       case 3:
-               temp = adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-               break;
-       default:
-               return -ENOTSUPP;
-       }
-
-       temp = CAL_NF(temp);
-
-       lbs_pr_debug(1, "%s: temp = %d\n", __FUNCTION__, temp);
-       val = (int *)wrq->u.name;
-       *val = temp;
-       return 0;
-}
-
-static int wlan_get_txrate_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       wlan_adapter *adapter = priv->adapter;
-       int *pdata;
-       struct iwreq *wrq = (struct iwreq *)req;
-       int ret = 0;
-       adapter->txrate = 0;
-       lbs_pr_debug(1, "wlan_get_txrate_ioctl\n");
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_tx_rate_query,
-                                   cmd_act_get, cmd_option_waitforrsp,
-                                   0, NULL);
-       if (ret)
-               return ret;
-
-       pdata = (int *)wrq->u.name;
-       *pdata = (int)adapter->txrate;
-       return 0;
-}
-
-static int wlan_get_adhoc_status_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-       char status[64];
-       wlan_adapter *adapter = priv->adapter;
-
-       memset(status, 0, sizeof(status));
-
-       switch (adapter->inframode) {
-       case wlan802_11ibss:
-               if (adapter->connect_status == libertas_connected) {
-                       if (adapter->adhoccreate)
-                               memcpy(&status, "AdhocStarted", sizeof(status));
-                       else
-                               memcpy(&status, "AdhocJoined", sizeof(status));
-               } else {
-                       memcpy(&status, "AdhocIdle", sizeof(status));
-               }
-               break;
-       case wlan802_11infrastructure:
-               memcpy(&status, "Inframode", sizeof(status));
-               break;
-       default:
-               memcpy(&status, "AutoUnknownmode", sizeof(status));
-               break;
-       }
-
-       lbs_pr_debug(1, "status = %s\n", status);
-       wrq->u.data.length = strlen(status) + 1;
-
-       if (wrq->u.data.pointer) {
-               if (copy_to_user(wrq->u.data.pointer,
-                                &status, wrq->u.data.length))
-                       return -EFAULT;
-       }
-
-       LEAVE();
-       return 0;
-}
-
-/**
- *  @brief Set/Get WPA IE
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                 A pointer to ifreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_setwpaie_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       struct iwreq *wrq = (struct iwreq *)req;
-       wlan_adapter *adapter = priv->adapter;
-       int ret = 0;
-
-       ENTER();
-
-       if (wrq->u.data.length) {
-               if (wrq->u.data.length > sizeof(adapter->wpa_ie)) {
-                       lbs_pr_debug(1, "failed to copy WPA IE, too big \n");
-                       return -EFAULT;
-               }
-               if (copy_from_user(adapter->wpa_ie, wrq->u.data.pointer,
-                                  wrq->u.data.length)) {
-                       lbs_pr_debug(1, "failed to copy WPA IE \n");
-                       return -EFAULT;
-               }
-               adapter->wpa_ie_len = wrq->u.data.length;
-               lbs_pr_debug(1, "Set wpa_ie_len=%d IE=%#x\n", adapter->wpa_ie_len,
-                      adapter->wpa_ie[0]);
-               lbs_dbg_hex("wpa_ie", adapter->wpa_ie, adapter->wpa_ie_len);
-               if (adapter->wpa_ie[0] == WPA_IE)
-                       adapter->secinfo.WPAenabled = 1;
-               else if (adapter->wpa_ie[0] == WPA2_IE)
-                       adapter->secinfo.WPA2enabled = 1;
-               else {
-                       adapter->secinfo.WPAenabled = 0;
-                       adapter->secinfo.WPA2enabled = 0;
-               }
-       } else {
-               memset(adapter->wpa_ie, 0, sizeof(adapter->wpa_ie));
-               adapter->wpa_ie_len = wrq->u.data.length;
-               lbs_pr_debug(1, "Reset wpa_ie_len=%d IE=%#x\n",
-                      adapter->wpa_ie_len, adapter->wpa_ie[0]);
-               adapter->secinfo.WPAenabled = 0;
-               adapter->secinfo.WPA2enabled = 0;
-       }
-
-       // enable/disable RSN in firmware if WPA is enabled/disabled
-       // depending on variable adapter->secinfo.WPAenabled is set or not
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_enable_rsn,
-                                   cmd_act_set, cmd_option_waitforrsp,
-                                   0, NULL);
-
-       LEAVE();
-       return ret;
-}
-
-/**
- *  @brief Set Auto prescan
- *  @param priv                 A pointer to wlan_private structure
- *  @param wrq                 A pointer to iwreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_subcmd_setprescan_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-       int data;
-       wlan_adapter *adapter = priv->adapter;
-       int *val;
-
-       data = SUBCMD_DATA(wrq);
-       lbs_pr_debug(1, "WLAN_SUBCMD_SET_PRESCAN %d\n", data);
-       adapter->prescan = data;
-
-       val = (int *)wrq->u.name;
-       *val = data;
-       return 0;
-}
-
-static int wlan_set_multiple_dtim_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       struct iwreq *wrq = (struct iwreq *)req;
-       u32 mdtim;
-       int idata;
-       int ret = -EINVAL;
-
-       ENTER();
-
-       idata = SUBCMD_DATA(wrq);
-       mdtim = (u32) idata;
-       if (((mdtim >= MRVDRV_MIN_MULTIPLE_DTIM)
-            && (mdtim <= MRVDRV_MAX_MULTIPLE_DTIM))
-           || (mdtim == MRVDRV_IGNORE_MULTIPLE_DTIM)) {
-               priv->adapter->multipledtim = mdtim;
-               ret = 0;
-       }
-       if (ret)
-               lbs_pr_debug(1, "Invalid parameter, multipledtim not changed.\n");
-
-       LEAVE();
-       return ret;
-}
-
-/**
- *  @brief Set authentication mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                 A pointer to ifreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_setauthalg_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       int alg;
-       struct iwreq *wrq = (struct iwreq *)req;
-       wlan_adapter *adapter = priv->adapter;
-
-       if (wrq->u.data.flags == 0) {
-               //from iwpriv subcmd
-               alg = SUBCMD_DATA(wrq);
-       } else {
-               //from wpa_supplicant subcmd
-               if (copy_from_user(&alg, wrq->u.data.pointer, sizeof(alg))) {
-                       lbs_pr_debug(1, "Copy from user failed\n");
-                       return -EFAULT;
-               }
-       }
-
-       lbs_pr_debug(1, "auth alg is %#x\n", alg);
-
-       switch (alg) {
-       case AUTH_ALG_SHARED_KEY:
-               adapter->secinfo.authmode = wlan802_11authmodeshared;
-               break;
-       case AUTH_ALG_NETWORK_EAP:
-               adapter->secinfo.authmode =
-                   wlan802_11authmodenetworkEAP;
-               break;
-       case AUTH_ALG_OPEN_SYSTEM:
-       default:
-               adapter->secinfo.authmode = wlan802_11authmodeopen;
-               break;
-       }
-       return 0;
-}
-
-/**
- *  @brief Set 802.1x authentication mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                 A pointer to ifreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_set8021xauthalg_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       int alg;
-       struct iwreq *wrq = (struct iwreq *)req;
-
-       if (wrq->u.data.flags == 0) {
-               //from iwpriv subcmd
-               alg = SUBCMD_DATA(wrq);
-       } else {
-               //from wpa_supplicant subcmd
-               if (copy_from_user(&alg, wrq->u.data.pointer, sizeof(int))) {
-                       lbs_pr_debug(1, "Copy from user failed\n");
-                       return -EFAULT;
-               }
-       }
-       lbs_pr_debug(1, "802.1x auth alg is %#x\n", alg);
-       priv->adapter->secinfo.auth1xalg = alg;
-       return 0;
-}
-
-static int wlan_setencryptionmode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       int mode;
-       struct iwreq *wrq = (struct iwreq *)req;
-
-       ENTER();
-
-       if (wrq->u.data.flags == 0) {
-               //from iwpriv subcmd
-               mode = SUBCMD_DATA(wrq);
-       } else {
-               //from wpa_supplicant subcmd
-               if (copy_from_user(&mode, wrq->u.data.pointer, sizeof(int))) {
-                       lbs_pr_debug(1, "Copy from user failed\n");
-                       return -EFAULT;
-               }
-       }
-       lbs_pr_debug(1, "encryption mode is %#x\n", mode);
-       priv->adapter->secinfo.Encryptionmode = mode;
-
-       LEAVE();
-       return 0;
-}
-
-static void adjust_mtu(wlan_private * priv)
-{
-       int mtu_increment = 0;
-
-       if (priv->adapter->linkmode == WLAN_LINKMODE_802_11)
-               mtu_increment += sizeof(struct ieee80211_hdr_4addr);
-
-       if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP)
-               mtu_increment += max(sizeof(struct tx_radiotap_hdr),
-                                    sizeof(struct rx_radiotap_hdr));
-       priv->wlan_dev.netdev->mtu = ETH_FRAME_LEN
-           - sizeof(struct ethhdr)
-           + mtu_increment;
-}
-
-/**
- *  @brief Set Link-Layer Layer mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                 A pointer to ifreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_set_linkmode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       int mode;
-
-       mode = (int)((struct ifreq *)((u8 *) req + 4))->ifr_data;
-
-       switch (mode) {
-       case WLAN_LINKMODE_802_3:
-               priv->adapter->linkmode = mode;
-               break;
-       case WLAN_LINKMODE_802_11:
-               priv->adapter->linkmode = mode;
-               break;
-       default:
-               lbs_pr_info("usb8388-5: invalid link-layer mode (%#x)\n",
-                      mode);
-               return -EINVAL;
-               break;
-       }
-       lbs_pr_debug(1, "usb8388-5: link-layer mode is %#x\n", mode);
-
-       adjust_mtu(priv);
-
-       return 0;
-}
-
-/**
- *  @brief Set Radio header mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                 A pointer to ifreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_set_radiomode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       int mode;
-
-       mode = (int)((struct ifreq *)((u8 *) req + 4))->ifr_data;
-
-       switch (mode) {
-       case WLAN_RADIOMODE_NONE:
-               priv->adapter->radiomode = mode;
-               break;
-       case WLAN_RADIOMODE_RADIOTAP:
-               priv->adapter->radiomode = mode;
-               break;
-       default:
-               lbs_pr_debug(1, "usb8388-5: invalid radio header mode (%#x)\n",
-                      mode);
-               return -EINVAL;
-       }
-       lbs_pr_debug(1, "usb8388-5: radio-header mode is %#x\n", mode);
-
-       adjust_mtu(priv);
-       return 0;
-}
-
-/**
- *  @brief Set Debug header mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                 A pointer to ifreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_set_debugmode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-       priv->adapter->debugmode = (int)((struct ifreq *)
-                                        ((u8 *) req + 4))->ifr_data;
-       return 0;
-}
-
-static int wlan_subcmd_getrxantenna_ioctl(wlan_private * priv,
-                                         struct ifreq *req)
-{
-       int len;
-       char buf[8];
-       struct iwreq *wrq = (struct iwreq *)req;
-
-       lbs_pr_debug(1, "WLAN_SUBCMD_GETRXANTENNA\n");
-       len = getrxantenna(priv, buf);
-
-       wrq->u.data.length = len;
-       if (wrq->u.data.pointer) {
-               if (copy_to_user(wrq->u.data.pointer, &buf, len)) {
-                       lbs_pr_debug(1, "CopyToUser failed\n");
-                       return -EFAULT;
-               }
-       }
-
-       return 0;
-}
-
-static int wlan_subcmd_gettxantenna_ioctl(wlan_private * priv,
-                                         struct ifreq *req)
-{
-       int len;
-       char buf[8];
-       struct iwreq *wrq = (struct iwreq *)req;
-
-       lbs_pr_debug(1, "WLAN_SUBCMD_GETTXANTENNA\n");
-       len = gettxantenna(priv, buf);
-
-       wrq->u.data.length = len;
-       if (wrq->u.data.pointer) {
-               if (copy_to_user(wrq->u.data.pointer, &buf, len)) {
-                       lbs_pr_debug(1, "CopyToUser failed\n");
-                       return -EFAULT;
-               }
-       }
-       return 0;
-}
-
-/**
- *  @brief Get the MAC TSF value from the firmware
- *
- *  @param priv         A pointer to wlan_private structure
- *  @param wrq          A pointer to iwreq structure containing buffer
- *                      space to store a TSF value retrieved from the firmware
- *
- *  @return             0 if successful; IOCTL error code otherwise
- */
-static int wlan_get_tsf_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-       u64 tsfval;
-       int ret;
-
-       ret = libertas_prepare_and_send_command(priv,
-                                   cmd_get_tsf,
-                                   0, cmd_option_waitforrsp, 0, &tsfval);
-
-       lbs_pr_debug(1, "IOCTL: Get TSF = 0x%016llx\n", tsfval);
-
-       if (ret != 0) {
-               lbs_pr_debug(1, "IOCTL: Get TSF; command exec failed\n");
-               ret = -EFAULT;
-       } else {
-               if (copy_to_user(wrq->u.data.pointer,
-                                &tsfval,
-                                min_t(size_t, wrq->u.data.length,
-                                    sizeof(tsfval))) != 0) {
-
-                       lbs_pr_debug(1, "IOCTL: Get TSF; Copy to user failed\n");
-                       ret = -EFAULT;
-               } else {
-                       ret = 0;
-               }
-       }
-       return ret;
-}
-
-/**
- *  @brief Get/Set adapt rate
- *  @param priv                 A pointer to wlan_private structure
- *  @param wrq                 A pointer to iwreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_adapt_rateset(wlan_private * priv, struct iwreq *wrq)
-{
-       int ret;
-       wlan_adapter *adapter = priv->adapter;
-       int data[2];
-
-       memset(data, 0, sizeof(data));
-       if (!wrq->u.data.length) {
-               lbs_pr_debug(1, "Get ADAPT RATE SET\n");
-               ret = libertas_prepare_and_send_command(priv,
-                                           cmd_802_11_rate_adapt_rateset,
-                                           cmd_act_get,
-                                           cmd_option_waitforrsp, 0, NULL);
-               data[0] = adapter->enablehwauto;
-               data[1] = adapter->ratebitmap;
-               if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 2)) {
-                       lbs_pr_debug(1, "Copy to user failed\n");
-                       return -EFAULT;
-               }
-#define GET_TWO_INT    2
-               wrq->u.data.length = GET_TWO_INT;
-       } else {
-               lbs_pr_debug(1, "Set ADAPT RATE SET\n");
-               if (wrq->u.data.length > 2)
-                       return -EINVAL;
-               if (copy_from_user
-                   (data, wrq->u.data.pointer,
-                    sizeof(int) * wrq->u.data.length)) {
-                       lbs_pr_debug(1, "Copy from user failed\n");
-                       return -EFAULT;
-               }
-
-               adapter->enablehwauto = data[0];
-               adapter->ratebitmap = data[1];
-               ret = libertas_prepare_and_send_command(priv,
-                                           cmd_802_11_rate_adapt_rateset,
-                                           cmd_act_set,
-                                           cmd_option_waitforrsp, 0, NULL);
-       }
-       return ret;
-}
-
-/**
- *  @brief Get/Set inactivity timeout
- *  @param priv                 A pointer to wlan_private structure
- *  @param wrq                 A pointer to iwreq structure
- *  @return                    0 --success, otherwise fail
- */
-static int wlan_inactivity_timeout(wlan_private * priv, struct iwreq *wrq)
-{
-       int ret;
-       int data = 0;
-       u16 timeout = 0;
-
-       ENTER();
-       if (wrq->u.data.length > 1)
-               return -ENOTSUPP;
-
-       if (wrq->u.data.length == 0) {
-               /* Get */
-               ret = libertas_prepare_and_send_command(priv,
-                                           cmd_802_11_inactivity_timeout,
-                                           cmd_act_get,
-                                           cmd_option_waitforrsp, 0,
-                                           &timeout);
-               data = timeout;
-               if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) {
-                       lbs_pr_debug(1, "Copy to user failed\n");
-                       return -EFAULT;
-               }
-       } else {
-               /* Set */
-               if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
-                       lbs_pr_debug(1, "Copy from user failed\n");
-                       return -EFAULT;
-               }
-
-               timeout = data;
-               ret = libertas_prepare_and_send_command(priv,
-                                           cmd_802_11_inactivity_timeout,
-                                           cmd_act_set,
-                                           cmd_option_waitforrsp, 0,
-                                           &timeout);
-       }
-
-       wrq->u.data.length = 1;
-
-       LEAVE();
-       return ret;
-}
-
-static int wlan_do_getlog_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-       int ret;
-       char buf[GETLOG_BUFSIZE - 1];
-       wlan_adapter *adapter = priv->adapter;
-
-       lbs_pr_debug(1, " GET STATS\n");
-
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_get_log,
-                                   0, cmd_option_waitforrsp, 0, NULL);
-
-       if (ret) {
-               return ret;
-       }
-
-       if (wrq->u.data.pointer) {
-               sprintf(buf, "\n  mcasttxframe %u failed %u retry %u "
-                       "multiretry %u framedup %u "
-                       "rtssuccess %u rtsfailure %u ackfailure %u\n"
-                       "rxfrag %u mcastrxframe %u fcserror %u "
-                       "txframe %u wepundecryptable %u ",
-                       adapter->logmsg.mcasttxframe,
-                       adapter->logmsg.failed,
-                       adapter->logmsg.retry,
-                       adapter->logmsg.multiretry,
-                       adapter->logmsg.framedup,
-                       adapter->logmsg.rtssuccess,
-                       adapter->logmsg.rtsfailure,
-                       adapter->logmsg.ackfailure,
-                       adapter->logmsg.rxfrag,
-                       adapter->logmsg.mcastrxframe,
-                       adapter->logmsg.fcserror,
-                       adapter->logmsg.txframe,
-                       adapter->logmsg.wepundecryptable);
-               wrq->u.data.length = strlen(buf) + 1;
-               if (copy_to_user(wrq->u.data.pointer, buf, wrq->u.data.length)) {
-                       lbs_pr_debug(1, "Copy to user failed\n");
-                       return -EFAULT;
-               }
-       }
-
-       return 0;
-}
-
-static int wlan_scan_type_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-       u8 buf[12];
-       u8 *option[] = { "active", "passive", "get", };
-       int i, max_options = (sizeof(option) / sizeof(option[0]));
-       int ret = 0;
-       wlan_adapter *adapter = priv->adapter;
-
-       if (priv->adapter->enable11d) {
-               lbs_pr_debug(1, "11D: Cannot set scantype when 11D enabled\n");
-               return -EFAULT;
-       }
-
-       memset(buf, 0, sizeof(buf));
-
-       if (copy_from_user(buf, wrq->u.data.pointer, min_t(size_t, sizeof(buf),
-                                                        wrq->u.data.length)))
-               return -EFAULT;
-
-       lbs_pr_debug(1, "Scan type Option = %s\n", buf);
-
-       buf[sizeof(buf) - 1] = '\0';
-
-       for (i = 0; i < max_options; i++) {
-               if (!strcmp(buf, option[i]))
-                       break;
-       }
-
-       switch (i) {
-       case 0:
-               adapter->scantype = cmd_scan_type_active;
-               break;
-       case 1:
-               adapter->scantype = cmd_scan_type_passive;
-               break;
-       case 2:
-               wrq->u.data.length = strlen(option[adapter->scantype]) + 1;
-
-               if (copy_to_user(wrq->u.data.pointer,
-                                option[adapter->scantype],
-                                wrq->u.data.length)) {
-                       lbs_pr_debug(1, "Copy to user failed\n");
-                       ret = -EFAULT;
-               }
-
-               break;
-       default:
-               lbs_pr_debug(1, "Invalid Scan type Ioctl Option\n");
-               ret = -EINVAL;
-               break;
-       }
-
-       return ret;
-}
-
-static int wlan_scan_mode_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-       wlan_adapter *adapter = priv->adapter;
-       u8 buf[12];
-       u8 *option[] = { "bss", "ibss", "any", "get" };
-       int i, max_options = (sizeof(option) / sizeof(option[0]));
-       int ret = 0;
-
-       ENTER();
-
-       memset(buf, 0, sizeof(buf));
-
-       if (copy_from_user(buf, wrq->u.data.pointer, min_t(size_t, sizeof(buf),
-                                                        wrq->u.data.length))) {
-               lbs_pr_debug(1, "Copy from user failed\n");
-               return -EFAULT;
-       }
-
-       lbs_pr_debug(1, "Scan mode Option = %s\n", buf);
-
-       buf[sizeof(buf) - 1] = '\0';
+static int wlan_set_region(wlan_private * priv, u16 region_code)
+{
+       int i;
 
-       for (i = 0; i < max_options; i++) {
-               if (!strcmp(buf, option[i]))
+       for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
+               // use the region code to search for the index
+               if (region_code == libertas_region_code_to_index[i]) {
+                       priv->adapter->regiontableindex = (u16) i;
+                       priv->adapter->regioncode = region_code;
                        break;
-       }
-
-       switch (i) {
-
-       case 0:
-               adapter->scanmode = cmd_bss_type_bss;
-               break;
-       case 1:
-               adapter->scanmode = cmd_bss_type_ibss;
-               break;
-       case 2:
-               adapter->scanmode = cmd_bss_type_any;
-               break;
-       case 3:
-
-               wrq->u.data.length = strlen(option[adapter->scanmode - 1]) + 1;
-
-               lbs_pr_debug(1, "Get Scan mode Option = %s\n",
-                      option[adapter->scanmode - 1]);
-
-               lbs_pr_debug(1, "Scan mode length %d\n", wrq->u.data.length);
-
-               if (copy_to_user(wrq->u.data.pointer,
-                                option[adapter->scanmode - 1],
-                                wrq->u.data.length)) {
-                       lbs_pr_debug(1, "Copy to user failed\n");
-                       ret = -EFAULT;
                }
-               lbs_pr_debug(1, "GET Scan type Option after copy = %s\n",
-                      (char *)wrq->u.data.pointer);
-
-               break;
-
-       default:
-               lbs_pr_debug(1, "Invalid Scan mode Ioctl Option\n");
-               ret = -EINVAL;
-               break;
        }
 
-       LEAVE();
-       return ret;
-}
-
-/**
- *  @brief Get/Set Adhoc G Rate
- *
- *  @param priv                A pointer to wlan_private structure
- *  @param wrq         A pointer to user data
- *  @return            0--success, otherwise fail
- */
-static int wlan_do_set_grate_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-       wlan_adapter *adapter = priv->adapter;
-       int data, data1;
-       int *val;
-
-       ENTER();
+       // if it's unidentified region code
+       if (i >= MRVDRV_MAX_REGION_CODE) {
+               lbs_pr_debug(1, "region Code not identified\n");
+               LEAVE();
+               return -1;
+       }
 
-       data1 = SUBCMD_DATA(wrq);
-       switch (data1) {
-       case 0:
-               adapter->adhoc_grate_enabled = 0;
-               break;
-       case 1:
-               adapter->adhoc_grate_enabled = 1;
-               break;
-       case 2:
-               break;
-       default:
+       if (libertas_set_regiontable(priv, priv->adapter->regioncode, 0)) {
+               LEAVE();
                return -EINVAL;
        }
-       data = adapter->adhoc_grate_enabled;
-       val = (int *)wrq->u.name;
-       *val = data;
-       LEAVE();
+
        return 0;
 }
 
@@ -1761,6 +680,7 @@ static int wlan_fwt_list_neighbor_ioctl(wlan_private * priv, struct ifreq *req)
  */
 static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
 {
+       struct iwreq *wrq = (struct iwreq *)req;
        static struct cmd_ds_fwt_access fwt_access;
        int ret;
 
@@ -1776,7 +696,7 @@ static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
                                    (void *)&fwt_access);
 
        if (ret == 0)
-               req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
+               wrq->u.param.value = le32_to_cpu(fwt_access.references);
        else
                return -EFAULT;
 
@@ -1792,6 +712,7 @@ static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
  */
 static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
 {
+       struct iwreq *wrq = (struct iwreq *)req;
        static struct cmd_ds_fwt_access fwt_access;
        int ret;
 
@@ -1807,7 +728,7 @@ static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
                                    (void *)&fwt_access);
 
        if (ret == 0)
-               req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
+               wrq->u.param.value = le32_to_cpu(fwt_access.references);
        else
                return -EFAULT;
 
@@ -1823,6 +744,7 @@ static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
  */
 static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
 {
+       struct iwreq *wrq = (struct iwreq *)req;
        struct cmd_ds_mesh_access mesh_access;
        int ret;
 
@@ -1835,9 +757,8 @@ static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
                                    cmd_option_waitforrsp, 0,
                                    (void *)&mesh_access);
 
-       if (ret == 0) {
-               req->ifr_data = (char *)(le32_to_cpu(mesh_access.data[0]));
-       }
+       if (ret == 0)
+               wrq->u.param.value = le32_to_cpu(mesh_access.data[0]);
        else
                return -EFAULT;
 
@@ -1898,36 +819,8 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
        lbs_pr_debug(1, "libertas_do_ioctl: ioctl cmd = 0x%x\n", cmd);
        switch (cmd) {
-       case WLANSCAN_TYPE:
-               lbs_pr_debug(1, "Scan type Ioctl\n");
-               ret = wlan_scan_type_ioctl(priv, wrq);
-               break;
-
        case WLAN_SETNONE_GETNONE:      /* set WPA mode on/off ioctl #20 */
                switch (wrq->u.data.flags) {
-               case WLANDEAUTH:
-                       lbs_pr_debug(1, "Deauth\n");
-                       libertas_send_deauth(priv);
-                       break;
-
-               case WLANADHOCSTOP:
-                       lbs_pr_debug(1, "Adhoc stop\n");
-                       ret = libertas_do_adhocstop_ioctl(priv);
-                       break;
-
-               case WLANRADIOON:
-                       wlan_radio_ioctl(priv, 1);
-                       break;
-
-               case WLANRADIOOFF:
-                       wlan_radio_ioctl(priv, 0);
-                       break;
-               case WLANWLANIDLEON:
-                       libertas_idle_on(priv);
-                       break;
-               case WLANWLANIDLEOFF:
-                       libertas_idle_off(priv);
-                       break;
                case WLAN_SUBCMD_BT_RESET:      /* bt_reset */
                        wlan_bt_reset_ioctl(priv);
                        break;
@@ -1937,162 +830,19 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                }               /* End of switch */
                break;
 
-       case WLANSETWPAIE:
-               ret = wlan_setwpaie_ioctl(priv, req);
-               break;
-       case WLAN_SETINT_GETINT:
-               /* The first 4 bytes of req->ifr_data is sub-ioctl number
-                * after 4 bytes sits the payload.
-                */
-               subcmd = (int)req->ifr_data;    //from iwpriv subcmd
-               switch (subcmd) {
-               case WLANNF:
-                       ret = wlan_get_nf(priv, wrq);
-                       break;
-               case WLANRSSI:
-                       ret = wlan_get_rssi(priv, wrq);
-                       break;
-               case WLANENABLE11D:
-                       ret = libertas_cmd_enable_11d(priv, wrq);
-                       break;
-               case WLANADHOCGRATE:
-                       ret = wlan_do_set_grate_ioctl(priv, wrq);
-                       break;
-               case WLAN_SUBCMD_SET_PRESCAN:
-                       ret = wlan_subcmd_setprescan_ioctl(priv, wrq);
-                       break;
-               }
-               break;
-
-       case WLAN_SETONEINT_GETONEINT:
-               switch (wrq->u.data.flags) {
-               case WLAN_BEACON_INTERVAL:
-                       ret = wlan_beacon_interval(priv, wrq);
-                       break;
-
-               case WLAN_LISTENINTRVL:
-                       if (!wrq->u.data.length) {
-                               int data;
-                               lbs_pr_debug(1, "Get locallisteninterval value\n");
-#define GET_ONE_INT    1
-                               data = adapter->locallisteninterval;
-                               if (copy_to_user(wrq->u.data.pointer,
-                                                &data, sizeof(int))) {
-                                       lbs_pr_debug(1, "Copy to user failed\n");
-                                       return -EFAULT;
-                               }
-
-                               wrq->u.data.length = GET_ONE_INT;
-                       } else {
-                               int data;
-                               if (copy_from_user
-                                   (&data, wrq->u.data.pointer, sizeof(int))) {
-                                       lbs_pr_debug(1, "Copy from user failed\n");
-                                       return -EFAULT;
-                               }
-
-                               lbs_pr_debug(1, "Set locallisteninterval = %d\n",
-                                      data);
-#define MAX_U16_VAL    65535
-                               if (data > MAX_U16_VAL) {
-                                       lbs_pr_debug(1, "Exceeds U16 value\n");
-                                       return -EINVAL;
-                               }
-                               adapter->locallisteninterval = data;
-                       }
-                       break;
-               case WLAN_TXCONTROL:
-                       ret = wlan_txcontrol(priv, wrq);        //adds for txcontrol ioctl
-                       break;
-
-               case WLAN_NULLPKTINTERVAL:
-                       ret = wlan_null_pkt_interval(priv, wrq);
-                       break;
-
-               default:
-                       ret = -EOPNOTSUPP;
-                       break;
-               }
-               break;
-
        case WLAN_SETONEINT_GETNONE:
                /* The first 4 bytes of req->ifr_data is sub-ioctl number
                 * after 4 bytes sits the payload.
                 */
-               subcmd = wrq->u.data.flags;     //from wpa_supplicant subcmd
-
+               subcmd = wrq->u.data.flags;
                if (!subcmd)
-                       subcmd = (int)req->ifr_data;    //from iwpriv subcmd
+                       subcmd = (int)wrq->u.param.value;
 
                switch (subcmd) {
-               case WLAN_SUBCMD_SETRXANTENNA:  /* SETRXANTENNA */
-                       idata = SUBCMD_DATA(wrq);
-                       ret = setrxantenna(priv, idata);
-                       break;
-               case WLAN_SUBCMD_SETTXANTENNA:  /* SETTXANTENNA */
-                       idata = SUBCMD_DATA(wrq);
-                       ret = settxantenna(priv, idata);
-                       break;
-               case WLAN_SET_ATIM_WINDOW:
-                       adapter->atimwindow = SUBCMD_DATA(wrq);
-                       adapter->atimwindow = min_t(__u16, adapter->atimwindow, 50);
-                       break;
-               case WLANSETBCNAVG:
-                       adapter->bcn_avg_factor = SUBCMD_DATA(wrq);
-                       if (adapter->bcn_avg_factor == 0)
-                               adapter->bcn_avg_factor =
-                                   DEFAULT_BCN_AVG_FACTOR;
-                       if (adapter->bcn_avg_factor > DEFAULT_BCN_AVG_FACTOR)
-                               adapter->bcn_avg_factor =
-                                   DEFAULT_BCN_AVG_FACTOR;
-                       break;
-               case WLANSETDATAAVG:
-                       adapter->data_avg_factor = SUBCMD_DATA(wrq);
-                       if (adapter->data_avg_factor == 0)
-                               adapter->data_avg_factor =
-                                   DEFAULT_DATA_AVG_FACTOR;
-                       if (adapter->data_avg_factor > DEFAULT_DATA_AVG_FACTOR)
-                               adapter->data_avg_factor =
-                                   DEFAULT_DATA_AVG_FACTOR;
-                       break;
                case WLANSETREGION:
                        idata = SUBCMD_DATA(wrq);
                        ret = wlan_set_region(priv, (u16) idata);
                        break;
-
-               case WLAN_SET_LISTEN_INTERVAL:
-                       idata = SUBCMD_DATA(wrq);
-                       adapter->listeninterval = (u16) idata;
-                       break;
-
-               case WLAN_SET_MULTIPLE_DTIM:
-                       ret = wlan_set_multiple_dtim_ioctl(priv, req);
-                       break;
-
-               case WLANSETAUTHALG:
-                       ret = wlan_setauthalg_ioctl(priv, req);
-                       break;
-
-               case WLANSET8021XAUTHALG:
-                       ret = wlan_set8021xauthalg_ioctl(priv, req);
-                       break;
-
-               case WLANSETENCRYPTIONMODE:
-                       ret = wlan_setencryptionmode_ioctl(priv, req);
-                       break;
-
-               case WLAN_SET_LINKMODE:
-                       ret = wlan_set_linkmode_ioctl(priv, req);
-                       break;
-
-               case WLAN_SET_RADIOMODE:
-                       ret = wlan_set_radiomode_ioctl(priv, req);
-                       break;
-
-               case WLAN_SET_DEBUGMODE:
-                       ret = wlan_set_debugmode_ioctl(priv, req);
-                       break;
-
                case WLAN_SUBCMD_MESH_SET_TTL:
                        idata = SUBCMD_DATA(wrq);
                        ret = wlan_mesh_set_ttl_ioctl(priv, idata);
@@ -2105,38 +855,8 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
                break;
 
-       case WLAN_SETNONE_GETTWELVE_CHAR:       /* Get Antenna settings */
-               /*
-                * We've not used IW_PRIV_TYPE_FIXED so sub-ioctl number is
-                * in flags of iwreq structure, otherwise it will be in
-                * mode member of iwreq structure.
-                */
-               switch ((int)wrq->u.data.flags) {
-               case WLAN_SUBCMD_GETRXANTENNA:  /* Get Rx Antenna */
-                       ret = wlan_subcmd_getrxantenna_ioctl(priv, req);
-                       break;
-
-               case WLAN_SUBCMD_GETTXANTENNA:  /* Get Tx Antenna */
-                       ret = wlan_subcmd_gettxantenna_ioctl(priv, req);
-                       break;
-
-               case WLAN_GET_TSF:
-                       ret = wlan_get_tsf_ioctl(priv, wrq);
-                       break;
-               }
-               break;
-
        case WLAN_SET128CHAR_GET128CHAR:
                switch ((int)wrq->u.data.flags) {
-
-               case WLANSCAN_MODE:
-                       lbs_pr_debug(1, "Scan mode Ioctl\n");
-                       ret = wlan_scan_mode_ioctl(priv, wrq);
-                       break;
-
-               case WLAN_GET_ADHOC_STATUS:
-                       ret = wlan_get_adhoc_status_ioctl(priv, wrq);
-                       break;
                case WLAN_SUBCMD_BT_ADD:
                        ret = wlan_bt_add_ioctl(priv, req);
                        break;
@@ -2168,41 +888,11 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                break;
 
        case WLAN_SETNONE_GETONEINT:
-               switch ((int)req->ifr_data) {
-               case WLANGETBCNAVG:
-                       pdata = (int *)wrq->u.name;
-                       *pdata = (int)adapter->bcn_avg_factor;
-                       break;
-
+               switch (wrq->u.param.value) {
                case WLANGETREGION:
                        pdata = (int *)wrq->u.name;
                        *pdata = (int)adapter->regioncode;
                        break;
-
-               case WLAN_GET_LISTEN_INTERVAL:
-                       pdata = (int *)wrq->u.name;
-                       *pdata = (int)adapter->listeninterval;
-                       break;
-
-               case WLAN_GET_LINKMODE:
-                       req->ifr_data = (char *)((u32) adapter->linkmode);
-                       break;
-
-               case WLAN_GET_RADIOMODE:
-                       req->ifr_data = (char *)((u32) adapter->radiomode);
-                       break;
-
-               case WLAN_GET_DEBUGMODE:
-                       req->ifr_data = (char *)((u32) adapter->debugmode);
-                       break;
-
-               case WLAN_GET_MULTIPLE_DTIM:
-                       pdata = (int *)wrq->u.name;
-                       *pdata = (int)adapter->multipledtim;
-                       break;
-               case WLAN_GET_TX_RATE:
-                       ret = wlan_get_txrate_ioctl(priv, req);
-                       break;
                case WLAN_SUBCMD_FWT_CLEANUP:   /* fwt_cleanup */
                        ret = wlan_fwt_cleanup_ioctl(priv, req);
                        break;
@@ -2222,196 +912,8 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
                break;
 
-       case WLANGETLOG:
-               ret = wlan_do_getlog_ioctl(priv, wrq);
-               break;
-
        case WLAN_SET_GET_SIXTEEN_INT:
                switch ((int)wrq->u.data.flags) {
-               case WLAN_TPCCFG:
-                       {
-                               int data[5];
-                               struct cmd_ds_802_11_tpc_cfg cfg;
-                               memset(&cfg, 0, sizeof(cfg));
-                               if ((wrq->u.data.length > 1)
-                                   && (wrq->u.data.length != 5))
-                                       return -1;
-
-                               if (wrq->u.data.length == 0) {
-                                       cfg.action =
-                                           cpu_to_le16
-                                           (cmd_act_get);
-                               } else {
-                                       if (copy_from_user
-                                           (data, wrq->u.data.pointer,
-                                            sizeof(int) * 5)) {
-                                               lbs_pr_debug(1,
-                                                      "Copy from user failed\n");
-                                               return -EFAULT;
-                                       }
-
-                                       cfg.action =
-                                           cpu_to_le16
-                                           (cmd_act_set);
-                                       cfg.enable = data[0];
-                                       cfg.usesnr = data[1];
-                                       cfg.P0 = data[2];
-                                       cfg.P1 = data[3];
-                                       cfg.P2 = data[4];
-                               }
-
-                               ret =
-                                   libertas_prepare_and_send_command(priv,
-                                                         cmd_802_11_tpc_cfg,
-                                                         0,
-                                                         cmd_option_waitforrsp,
-                                                         0, (void *)&cfg);
-
-                               data[0] = cfg.enable;
-                               data[1] = cfg.usesnr;
-                               data[2] = cfg.P0;
-                               data[3] = cfg.P1;
-                               data[4] = cfg.P2;
-                               if (copy_to_user
-                                   (wrq->u.data.pointer, data,
-                                    sizeof(int) * 5)) {
-                                       lbs_pr_debug(1, "Copy to user failed\n");
-                                       return -EFAULT;
-                               }
-
-                               wrq->u.data.length = 5;
-                       }
-                       break;
-
-               case WLAN_POWERCFG:
-                       {
-                               int data[4];
-                               struct cmd_ds_802_11_pwr_cfg cfg;
-                               memset(&cfg, 0, sizeof(cfg));
-                               if ((wrq->u.data.length > 1)
-                                   && (wrq->u.data.length != 4))
-                                       return -1;
-                               if (wrq->u.data.length == 0) {
-                                       cfg.action =
-                                           cpu_to_le16
-                                           (cmd_act_get);
-                               } else {
-                                       if (copy_from_user
-                                           (data, wrq->u.data.pointer,
-                                            sizeof(int) * 4)) {
-                                               lbs_pr_debug(1,
-                                                      "Copy from user failed\n");
-                                               return -EFAULT;
-                                       }
-
-                                       cfg.action =
-                                           cpu_to_le16
-                                           (cmd_act_set);
-                                       cfg.enable = data[0];
-                                       cfg.PA_P0 = data[1];
-                                       cfg.PA_P1 = data[2];
-                                       cfg.PA_P2 = data[3];
-                               }
-                               ret =
-                                   libertas_prepare_and_send_command(priv,
-                                                         cmd_802_11_pwr_cfg,
-                                                         0,
-                                                         cmd_option_waitforrsp,
-                                                         0, (void *)&cfg);
-                               data[0] = cfg.enable;
-                               data[1] = cfg.PA_P0;
-                               data[2] = cfg.PA_P1;
-                               data[3] = cfg.PA_P2;
-                               if (copy_to_user
-                                   (wrq->u.data.pointer, data,
-                                    sizeof(int) * 4)) {
-                                       lbs_pr_debug(1, "Copy to user failed\n");
-                                       return -EFAULT;
-                               }
-
-                               wrq->u.data.length = 4;
-                       }
-                       break;
-               case WLAN_AUTO_FREQ_SET:
-                       {
-                               int data[3];
-                               struct cmd_ds_802_11_afc afc;
-                               memset(&afc, 0, sizeof(afc));
-                               if (wrq->u.data.length != 3)
-                                       return -1;
-                               if (copy_from_user
-                                   (data, wrq->u.data.pointer,
-                                    sizeof(int) * 3)) {
-                                       lbs_pr_debug(1, "Copy from user failed\n");
-                                       return -EFAULT;
-                               }
-                               afc.afc_auto = data[0];
-
-                               if (afc.afc_auto != 0) {
-                                       afc.threshold = data[1];
-                                       afc.period = data[2];
-                               } else {
-                                       afc.timing_offset = data[1];
-                                       afc.carrier_offset = data[2];
-                               }
-                               ret =
-                                   libertas_prepare_and_send_command(priv,
-                                                         cmd_802_11_set_afc,
-                                                         0,
-                                                         cmd_option_waitforrsp,
-                                                         0, (void *)&afc);
-                       }
-                       break;
-               case WLAN_AUTO_FREQ_GET:
-                       {
-                               int data[3];
-                               struct cmd_ds_802_11_afc afc;
-                               memset(&afc, 0, sizeof(afc));
-                               ret =
-                                   libertas_prepare_and_send_command(priv,
-                                                         cmd_802_11_get_afc,
-                                                         0,
-                                                         cmd_option_waitforrsp,
-                                                         0, (void *)&afc);
-                               data[0] = afc.afc_auto;
-                               data[1] = afc.timing_offset;
-                               data[2] = afc.carrier_offset;
-                               if (copy_to_user
-                                   (wrq->u.data.pointer, data,
-                                    sizeof(int) * 3)) {
-                                       lbs_pr_debug(1, "Copy to user failed\n");
-                                       return -EFAULT;
-                               }
-
-                               wrq->u.data.length = 3;
-                       }
-                       break;
-               case WLAN_SCANPROBES:
-                       {
-                               int data;
-                               if (wrq->u.data.length > 0) {
-                                       if (copy_from_user
-                                           (&data, wrq->u.data.pointer,
-                                            sizeof(int))) {
-                                               lbs_pr_debug(1,
-                                                      "Copy from user failed\n");
-                                               return -EFAULT;
-                                       }
-
-                                       adapter->scanprobes = data;
-                               } else {
-                                       data = adapter->scanprobes;
-                                       if (copy_to_user
-                                           (wrq->u.data.pointer, &data,
-                                            sizeof(int))) {
-                                               lbs_pr_debug(1,
-                                                      "Copy to user failed\n");
-                                               return -EFAULT;
-                                       }
-                               }
-                               wrq->u.data.length = 1;
-                       }
-                       break;
                case WLAN_LED_GPIO_CTRL:
                        {
                                int i;
@@ -2475,17 +977,6 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                                wrq->u.data.length = gpio->header.len;
                        }
                        break;
-               case WLAN_ADAPT_RATESET:
-                       ret = wlan_adapt_rateset(priv, wrq);
-                       break;
-               case WLAN_INACTIVITY_TIMEOUT:
-                       ret = wlan_inactivity_timeout(priv, wrq);
-                       break;
-               case WLANSNR:
-                       ret = wlan_get_snr(priv, wrq);
-                       break;
-               case WLAN_GET_RXINFO:
-                       ret = wlan_get_rxinfo(priv, wrq);
                }
                break;