]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/net/wireless/libertas/wext.c
[PATCH] libertas: make more functions static & remove unused functions
[linux-2.6-omap-h63xx.git] / drivers / net / wireless / libertas / wext.c
index 8939251a2f4cd4efe3e775a10d396f39269e1f77..e8c0629f9a4bdde794e3a85c48dc43a5cf3aa5bc 100644 (file)
 #include "assoc.h"
 
 
-/**
- * the rates supported by the card
- */
-static u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES] =
-    { 0x02, 0x04, 0x0B, 0x16, 0x00, 0x0C, 0x12,
-      0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x00
-};
-
 /**
  *  @brief Convert mw value to dbm value
  *
@@ -165,7 +157,7 @@ static struct chan_freq_power *find_cfp_by_band_and_freq(wlan_adapter * adapter,
  *  @option                    Radio Option
  *  @return                    0 --success, otherwise fail
  */
-int wlan_radio_ioctl(wlan_private * priv, u8 option)
+static int wlan_radio_ioctl(wlan_private * priv, u8 option)
 {
        int ret = 0;
        wlan_adapter *adapter = priv->adapter;
@@ -177,9 +169,9 @@ int wlan_radio_ioctl(wlan_private * priv, u8 option)
                adapter->radioon = option;
 
                ret = libertas_prepare_and_send_command(priv,
-                                           cmd_802_11_radio_control,
-                                           cmd_act_set,
-                                           cmd_option_waitforrsp, 0, NULL);
+                                           CMD_802_11_RADIO_CONTROL,
+                                           CMD_ACT_SET,
+                                           CMD_OPTION_WAITFORRSP, 0, NULL);
        }
 
        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
@@ -187,57 +179,21 @@ int wlan_radio_ioctl(wlan_private * priv, u8 option)
 }
 
 /**
- *  @brief Copy rates
- *
- *  @param dest                 A pointer to Dest Buf
- *  @param src                 A pointer to Src Buf
- *  @param len                  The len of Src Buf
- *  @return                    Number of rates copyed
- */
-static inline int copyrates(u8 * dest, int pos, u8 * src, int len)
-{
-       int i;
-
-       for (i = 0; i < len && src[i]; i++, pos++) {
-               if (pos >= sizeof(u8) * WLAN_SUPPORTED_RATES)
-                       break;
-               dest[pos] = src[i];
-       }
-
-       return pos;
-}
-
-/**
- *  @brief Get active data rates
+ *  @brief Copy active data rates based on adapter mode and status
  *
  *  @param adapter              A pointer to wlan_adapter structure
  *  @param rate                        The buf to return the active rates
- *  @return                    The number of rates
  */
-static int get_active_data_rates(wlan_adapter * adapter,
-                                u8* rates)
+static void copy_active_data_rates(wlan_adapter * adapter, u8 * rates)
 {
-       int k = 0;
-
        lbs_deb_enter(LBS_DEB_WEXT);
 
-       if (adapter->connect_status != libertas_connected) {
-               if (adapter->mode == IW_MODE_INFRA) {
-                       lbs_deb_wext("infra\n");
-                       k = copyrates(rates, k, libertas_supported_rates,
-                                     sizeof(libertas_supported_rates));
-               } else {
-                       lbs_deb_wext("Adhoc G\n");
-                       k = copyrates(rates, k, libertas_adhoc_rates_g,
-                                     sizeof(libertas_adhoc_rates_g));
-               }
-       } else {
-               k = copyrates(rates, 0, adapter->curbssparams.datarates,
-                             adapter->curbssparams.numofrates);
-       }
+       if (adapter->connect_status != LIBERTAS_CONNECTED)
+               memcpy(rates, libertas_bg_rates, MAX_RATES);
+       else
+               memcpy(rates, adapter->curbssparams.rates, MAX_RATES);
 
-       lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", k);
-       return k;
+       lbs_deb_leave(LBS_DEB_WEXT);
 }
 
 static int wlan_get_name(struct net_device *dev, struct iw_request_info *info,
@@ -305,7 +261,7 @@ static int wlan_get_wap(struct net_device *dev, struct iw_request_info *info,
 
        lbs_deb_enter(LBS_DEB_WEXT);
 
-       if (adapter->connect_status == libertas_connected) {
+       if (adapter->connect_status == LIBERTAS_CONNECTED) {
                memcpy(awrq->sa_data, adapter->curbssparams.bssid, ETH_ALEN);
        } else {
                memset(awrq->sa_data, 0, ETH_ALEN);
@@ -382,7 +338,7 @@ static int mesh_get_nick(struct net_device *dev, struct iw_request_info *info,
 
        /* Use nickname to indicate that mesh is on */
 
-       if (adapter->connect_status == libertas_connected) {
+       if (adapter->connect_status == LIBERTAS_CONNECTED) {
                strncpy(extra, "Mesh", 12);
                extra[12] = '\0';
                dwrq->length = strlen(extra) + 1;
@@ -414,8 +370,8 @@ static int wlan_set_rts(struct net_device *dev, struct iw_request_info *info,
                adapter->rtsthsd = rthr;
        }
 
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
-                                   cmd_act_set, cmd_option_waitforrsp,
+       ret = libertas_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,
+                                   CMD_ACT_SET, CMD_OPTION_WAITFORRSP,
                                    OID_802_11_RTS_THRESHOLD, &rthr);
 
        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
@@ -432,8 +388,8 @@ static int wlan_get_rts(struct net_device *dev, struct iw_request_info *info,
        lbs_deb_enter(LBS_DEB_WEXT);
 
        adapter->rtsthsd = 0;
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
-                                   cmd_act_get, cmd_option_waitforrsp,
+       ret = libertas_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,
+                                   CMD_ACT_GET, CMD_OPTION_WAITFORRSP,
                                    OID_802_11_RTS_THRESHOLD, NULL);
        if (ret)
                goto out;
@@ -467,8 +423,8 @@ static int wlan_set_frag(struct net_device *dev, struct iw_request_info *info,
                adapter->fragthsd = fthr;
        }
 
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
-                                   cmd_act_set, cmd_option_waitforrsp,
+       ret = libertas_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,
+                                   CMD_ACT_SET, CMD_OPTION_WAITFORRSP,
                                    OID_802_11_FRAGMENTATION_THRESHOLD, &fthr);
 
        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
@@ -486,8 +442,8 @@ static int wlan_get_frag(struct net_device *dev, struct iw_request_info *info,
 
        adapter->fragthsd = 0;
        ret = libertas_prepare_and_send_command(priv,
-                                   cmd_802_11_snmp_mib,
-                                   cmd_act_get, cmd_option_waitforrsp,
+                                   CMD_802_11_SNMP_MIB,
+                                   CMD_ACT_GET, CMD_OPTION_WAITFORRSP,
                                    OID_802_11_FRAGMENTATION_THRESHOLD, NULL);
        if (ret)
                goto out;
@@ -539,9 +495,9 @@ static int wlan_get_txpow(struct net_device *dev,
        lbs_deb_enter(LBS_DEB_WEXT);
 
        ret = libertas_prepare_and_send_command(priv,
-                                   cmd_802_11_rf_tx_power,
-                                   cmd_act_tx_power_opt_get,
-                                   cmd_option_waitforrsp, 0, NULL);
+                                   CMD_802_11_RF_TX_POWER,
+                                   CMD_ACT_TX_POWER_OPT_GET,
+                                   CMD_OPTION_WAITFORRSP, 0, NULL);
 
        if (ret)
                goto out;
@@ -581,9 +537,9 @@ static int wlan_set_retry(struct net_device *dev, struct iw_request_info *info,
                /* Adding 1 to convert retry count to try count */
                adapter->txretrycount = vwrq->value + 1;
 
-               ret = libertas_prepare_and_send_command(priv, cmd_802_11_snmp_mib,
-                                           cmd_act_set,
-                                           cmd_option_waitforrsp,
+               ret = libertas_prepare_and_send_command(priv, CMD_802_11_SNMP_MIB,
+                                           CMD_ACT_SET,
+                                           CMD_OPTION_WAITFORRSP,
                                            OID_802_11_TX_RETRYCOUNT, NULL);
 
                if (ret)
@@ -608,8 +564,8 @@ static int wlan_get_retry(struct net_device *dev, struct iw_request_info *info,
 
        adapter->txretrycount = 0;
        ret = libertas_prepare_and_send_command(priv,
-                                   cmd_802_11_snmp_mib,
-                                   cmd_act_get, cmd_option_waitforrsp,
+                                   CMD_802_11_SNMP_MIB,
+                                   CMD_ACT_GET, CMD_OPTION_WAITFORRSP,
                                    OID_802_11_TX_RETRYCOUNT, NULL);
        if (ret)
                goto out;
@@ -673,7 +629,7 @@ static int wlan_get_range(struct net_device *dev, struct iw_request_info *info,
        wlan_adapter *adapter = priv->adapter;
        struct iw_range *range = (struct iw_range *)extra;
        struct chan_freq_power *cfp;
-       u8 rates[WLAN_SUPPORTED_RATES];
+       u8 rates[MAX_RATES + 1];
 
        u8 flag = 0;
 
@@ -686,19 +642,17 @@ static int wlan_get_range(struct net_device *dev, struct iw_request_info *info,
        range->max_nwid = 0;
 
        memset(rates, 0, sizeof(rates));
-       range->num_bitrates = get_active_data_rates(adapter, rates);
-
-       for (i = 0; i < min_t(__u8, range->num_bitrates, IW_MAX_BITRATES) && rates[i];
-            i++) {
-               range->bitrate[i] = (rates[i] & 0x7f) * 500000;
-       }
+       copy_active_data_rates(adapter, rates);
+       range->num_bitrates = strnlen(rates, IW_MAX_BITRATES);
+       for (i = 0; i < range->num_bitrates; i++)
+               range->bitrate[i] = rates[i] * 500000;
        range->num_bitrates = i;
        lbs_deb_wext("IW_MAX_BITRATES %d, num_bitrates %d\n", IW_MAX_BITRATES,
               range->num_bitrates);
 
        range->num_frequency = 0;
        if (priv->adapter->enable11d &&
-           adapter->connect_status == libertas_connected) {
+           adapter->connect_status == LIBERTAS_CONNECTED) {
                u8 chan_no;
                u8 band;
 
@@ -858,9 +812,9 @@ static int wlan_set_power(struct net_device *dev, struct iw_request_info *info,
         */
 
        if (vwrq->disabled) {
-               adapter->psmode = wlan802_11powermodecam;
+               adapter->psmode = WLAN802_11POWERMODECAM;
                if (adapter->psstate != PS_STATE_FULL_POWER) {
-                       libertas_ps_wakeup(priv, cmd_option_waitforrsp);
+                       libertas_ps_wakeup(priv, CMD_OPTION_WAITFORRSP);
                }
 
                return 0;
@@ -875,14 +829,14 @@ static int wlan_set_power(struct net_device *dev, struct iw_request_info *info,
                return -EINVAL;
        }
 
-       if (adapter->psmode != wlan802_11powermodecam) {
+       if (adapter->psmode != WLAN802_11POWERMODECAM) {
                return 0;
        }
 
-       adapter->psmode = wlan802_11powermodemax_psp;
+       adapter->psmode = WLAN802_11POWERMODEMAX_PSP;
 
-       if (adapter->connect_status == libertas_connected) {
-               libertas_ps_sleep(priv, cmd_option_waitforrsp);
+       if (adapter->connect_status == LIBERTAS_CONNECTED) {
+               libertas_ps_sleep(priv, CMD_OPTION_WAITFORRSP);
        }
 
        lbs_deb_leave(LBS_DEB_WEXT);
@@ -900,8 +854,8 @@ static int wlan_get_power(struct net_device *dev, struct iw_request_info *info,
 
        mode = adapter->psmode;
 
-       if ((vwrq->disabled = (mode == wlan802_11powermodecam))
-           || adapter->connect_status == libertas_disconnected)
+       if ((vwrq->disabled = (mode == WLAN802_11POWERMODECAM))
+           || adapter->connect_status == LIBERTAS_DISCONNECTED)
        {
                goto out;
        }
@@ -913,148 +867,6 @@ out:
        return 0;
 }
 
-/*
- * iwpriv settable callbacks
- */
-
-static const iw_handler wlan_private_handler[] = {
-       NULL,                   /* SIOCIWFIRSTPRIV */
-};
-
-static const struct iw_priv_args wlan_private_args[] = {
-       /*
-        * { cmd, set_args, get_args, name }
-        */
-       /* Using iwpriv sub-command feature */
-       {
-        WLAN_SETONEINT_GETNONE,        /* IOCTL: 24 */
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        IW_PRIV_TYPE_NONE,
-        ""},
-       {
-        WLANSETREGION,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        IW_PRIV_TYPE_NONE,
-        "setregioncode"},
-       {
-        WLAN_SUBCMD_MESH_SET_TTL,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        IW_PRIV_TYPE_NONE,
-        "mesh_set_ttl"},
-       {
-        WLAN_SETNONE_GETONEINT,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        ""},
-       {
-        WLANGETREGION,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        "getregioncode"},
-       {
-        WLAN_SUBCMD_FWT_CLEANUP,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        "fwt_cleanup"},
-       {
-        WLAN_SUBCMD_FWT_TIME,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        "fwt_time"},
-       {
-        WLAN_SUBCMD_MESH_GET_TTL,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        "mesh_get_ttl"},
-       {
-        WLAN_SETNONE_GETNONE,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_NONE,
-        ""},
-       {
-        WLAN_SUBCMD_FWT_RESET,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_NONE,
-        "fwt_reset"},
-       {
-        WLAN_SUBCMD_BT_RESET,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_NONE,
-        "bt_reset"},
-       {
-        WLAN_SET128CHAR_GET128CHAR,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        ""},
-       /* BT Management */
-       {
-        WLAN_SUBCMD_BT_ADD,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "bt_add"},
-       {
-        WLAN_SUBCMD_BT_DEL,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "bt_del"},
-       {
-        WLAN_SUBCMD_BT_LIST,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "bt_list"},
-       {
-        WLAN_SUBCMD_BT_SET_INVERT,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        IW_PRIV_TYPE_NONE,
-        "bt_set_invert"},
-       {
-        WLAN_SUBCMD_BT_GET_INVERT,
-        IW_PRIV_TYPE_NONE,
-        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-        "bt_get_invert"},
-       /* FWT Management */
-       {
-        WLAN_SUBCMD_FWT_ADD,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "fwt_add"},
-       {
-        WLAN_SUBCMD_FWT_DEL,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "fwt_del"},
-       {
-        WLAN_SUBCMD_FWT_LOOKUP,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "fwt_lookup"},
-       {
-        WLAN_SUBCMD_FWT_LIST_NEIGHBOR,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "fwt_list_neigh"},
-       {
-        WLAN_SUBCMD_FWT_LIST,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "fwt_list"},
-       {
-        WLAN_SUBCMD_FWT_LIST_ROUTE,
-        IW_PRIV_TYPE_CHAR | 128,
-        IW_PRIV_TYPE_CHAR | 128,
-        "fwt_list_route"},
-       {
-        WLAN_SET_GET_SIXTEEN_INT,
-        IW_PRIV_TYPE_INT | 16,
-        IW_PRIV_TYPE_INT | 16,
-        ""},
-       {
-        WLAN_LED_GPIO_CTRL,
-        IW_PRIV_TYPE_INT | 16,
-        IW_PRIV_TYPE_INT | 16,
-        "ledgpio"},
-};
-
 static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
 {
        enum {
@@ -1079,7 +891,7 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
        priv->wstats.status = adapter->mode;
 
        /* If we're not associated, all quality values are meaningless */
-       if (adapter->connect_status != libertas_connected)
+       if (adapter->connect_status != LIBERTAS_CONNECTED)
                goto out;
 
        /* Quality by RSSI */
@@ -1142,9 +954,9 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
        stats_valid = 1;
 
        /* update stats asynchronously for future calls */
-       libertas_prepare_and_send_command(priv, cmd_802_11_rssi, 0,
+       libertas_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
                                        0, 0, NULL);
-       libertas_prepare_and_send_command(priv, cmd_802_11_get_log, 0,
+       libertas_prepare_and_send_command(priv, CMD_802_11_GET_LOG, 0,
                                        0, 0, NULL);
 out:
        if (!stats_valid) {
@@ -1222,88 +1034,46 @@ out:
        return ret;
 }
 
-/**
- *  @brief use index to get the data rate
- *
- *  @param index                The index of data rate
- *  @return                    data rate or 0
- */
-u32 libertas_index_to_data_rate(u8 index)
-{
-       if (index >= sizeof(libertas_wlan_data_rates))
-               index = 0;
-
-       return libertas_wlan_data_rates[index];
-}
-
-/**
- *  @brief use rate to get the index
- *
- *  @param rate                 data rate
- *  @return                    index or 0
- */
-u8 libertas_data_rate_to_index(u32 rate)
-{
-       u8 *ptr;
-
-       if (rate)
-               if ((ptr = memchr(libertas_wlan_data_rates, (u8) rate,
-                                 sizeof(libertas_wlan_data_rates))))
-                       return (ptr - libertas_wlan_data_rates);
-
-       return 0;
-}
-
 static int wlan_set_rate(struct net_device *dev, struct iw_request_info *info,
                  struct iw_param *vwrq, char *extra)
 {
        wlan_private *priv = dev->priv;
        wlan_adapter *adapter = priv->adapter;
-       u32 data_rate;
+       u32 new_rate;
        u16 action;
-       int ret = 0;
-       u8 rates[WLAN_SUPPORTED_RATES];
-       u8 *rate;
+       int ret = -EINVAL;
+       u8 rates[MAX_RATES + 1];
 
        lbs_deb_enter(LBS_DEB_WEXT);
-
        lbs_deb_wext("vwrq->value %d\n", vwrq->value);
 
+       /* Auto rate? */
        if (vwrq->value == -1) {
-               action = cmd_act_set_tx_auto;   // Auto
-               adapter->is_datarate_auto = 1;
-               adapter->datarate = 0;
+               action = CMD_ACT_SET_TX_AUTO;
+               adapter->auto_rate = 1;
+               adapter->cur_rate = 0;
        } else {
-               if (vwrq->value % 100000) {
-                       return -EINVAL;
-               }
-
-               data_rate = vwrq->value / 500000;
+               if (vwrq->value % 100000)
+                       goto out;
 
                memset(rates, 0, sizeof(rates));
-               get_active_data_rates(adapter, rates);
-               rate = rates;
-               while (*rate) {
-                       lbs_deb_wext("rate=0x%X, wanted data_rate 0x%X\n", *rate,
-                              data_rate);
-                       if ((*rate & 0x7f) == (data_rate & 0x7f))
-                               break;
-                       rate++;
-               }
-               if (!*rate) {
-                       lbs_pr_alert("fixed data rate 0x%X out "
-                              "of range\n", data_rate);
-                       return -EINVAL;
+               copy_active_data_rates(adapter, rates);
+               new_rate = vwrq->value / 500000;
+               if (!memchr(rates, new_rate, sizeof(rates))) {
+                       lbs_pr_alert("fixed data rate 0x%X out of range\n",
+                               new_rate);
+                       goto out;
                }
 
-               adapter->datarate = data_rate;
-               action = cmd_act_set_tx_fix_rate;
-               adapter->is_datarate_auto = 0;
+               adapter->cur_rate = new_rate;
+               action = CMD_ACT_SET_TX_FIX_RATE;
+               adapter->auto_rate = 0;
        }
 
-       ret = libertas_prepare_and_send_command(priv, cmd_802_11_data_rate,
-                                   action, cmd_option_waitforrsp, 0, NULL);
+       ret = libertas_prepare_and_send_command(priv, CMD_802_11_DATA_RATE,
+                                   action, CMD_OPTION_WAITFORRSP, 0, NULL);
 
+out:
        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
        return ret;
 }
@@ -1316,14 +1086,19 @@ static int wlan_get_rate(struct net_device *dev, struct iw_request_info *info,
 
        lbs_deb_enter(LBS_DEB_WEXT);
 
-       if (adapter->is_datarate_auto) {
-               vwrq->fixed = 0;
+       if (adapter->connect_status == LIBERTAS_CONNECTED) {
+               vwrq->value = adapter->cur_rate * 500000;
+
+               if (adapter->auto_rate)
+                       vwrq->fixed = 0;
+               else
+                       vwrq->fixed = 1;
+
        } else {
-               vwrq->fixed = 1;
+               vwrq->fixed = 0;
+               vwrq->value = 0;
        }
 
-       vwrq->value = adapter->datarate * 500000;
-
        lbs_deb_leave(LBS_DEB_WEXT);
        return 0;
 }
@@ -1467,7 +1242,7 @@ static int wlan_set_wep_key(struct assoc_request *assoc_req,
                            int set_tx_key)
 {
        int ret = 0;
-       struct WLAN_802_11_KEY *pkey;
+       struct enc_key *pkey;
 
        lbs_deb_enter(LBS_DEB_WEXT);
 
@@ -1486,7 +1261,7 @@ static int wlan_set_wep_key(struct assoc_request *assoc_req,
        pkey = &assoc_req->wep_keys[index];
 
        if (key_length > 0) {
-               memset(pkey, 0, sizeof(struct WLAN_802_11_KEY));
+               memset(pkey, 0, sizeof(struct enc_key));
                pkey->type = KEY_TYPE_ID_WEP;
 
                /* Standardize the key length */
@@ -1554,11 +1329,11 @@ static void disable_wpa(struct assoc_request *assoc_req)
 {
        lbs_deb_enter(LBS_DEB_WEXT);
 
-       memset(&assoc_req->wpa_mcast_key, 0, sizeof (struct WLAN_802_11_KEY));
+       memset(&assoc_req->wpa_mcast_key, 0, sizeof (struct enc_key));
        assoc_req->wpa_mcast_key.flags = KEY_INFO_WPA_MCAST;
        set_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
 
-       memset(&assoc_req->wpa_unicast_key, 0, sizeof (struct WLAN_802_11_KEY));
+       memset(&assoc_req->wpa_unicast_key, 0, sizeof (struct enc_key));
        assoc_req->wpa_unicast_key.flags = KEY_INFO_WPA_UNICAST;
        set_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
 
@@ -1709,7 +1484,7 @@ static int wlan_get_encodeext(struct net_device *dev,
                           && (adapter->secinfo.WPAenabled ||
                               adapter->secinfo.WPA2enabled)) {
                        /* WPA */
-                       struct WLAN_802_11_KEY * pkey = NULL;
+                       struct enc_key * pkey = NULL;
 
                        if (   adapter->wpa_mcast_key.len
                            && (adapter->wpa_mcast_key.flags & KEY_INFO_WPA_ENABLED))
@@ -1821,7 +1596,7 @@ static int wlan_set_encodeext(struct net_device *dev,
                if (set_tx_key)
                        set_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags);
        } else if ((alg == IW_ENCODE_ALG_TKIP) || (alg == IW_ENCODE_ALG_CCMP)) {
-               struct WLAN_802_11_KEY * pkey;
+               struct enc_key * pkey;
 
                /* validate key length */
                if (((alg == IW_ENCODE_ALG_TKIP)
@@ -1844,7 +1619,7 @@ static int wlan_set_encodeext(struct net_device *dev,
                        set_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
                }
 
-               memset(pkey, 0, sizeof (struct WLAN_802_11_KEY));
+               memset(pkey, 0, sizeof (struct enc_key));
                memcpy(pkey->key, ext->key, ext->key_len);
                pkey->len = ext->key_len;
                if (pkey->len)
@@ -1861,9 +1636,6 @@ static int wlan_set_encodeext(struct net_device *dev,
                        pkey->type = KEY_TYPE_ID_TKIP;
                } else if (alg == IW_ENCODE_ALG_CCMP) {
                        pkey->type = KEY_TYPE_ID_AES;
-               } else {
-                       ret = -EINVAL;
-                       goto out;
                }
 
                /* If WPA isn't enabled yet, do that now */
@@ -2121,7 +1893,7 @@ static int wlan_set_txpow(struct net_device *dev, struct iw_request_info *info,
                return 0;
        }
 
-       adapter->preamble = cmd_type_auto_preamble;
+       adapter->preamble = CMD_TYPE_AUTO_PREAMBLE;
 
        wlan_radio_ioctl(priv, RADIO_ON);
 
@@ -2138,9 +1910,9 @@ static int wlan_set_txpow(struct net_device *dev, struct iw_request_info *info,
        lbs_deb_wext("txpower set %d dbm\n", dbm);
 
        ret = libertas_prepare_and_send_command(priv,
-                                   cmd_802_11_rf_tx_power,
-                                   cmd_act_tx_power_opt_set_low,
-                                   cmd_option_waitforrsp, 0, (void *)&dbm);
+                                   CMD_802_11_RF_TX_POWER,
+                                   CMD_ACT_TX_POWER_OPT_SET_LOW,
+                                   CMD_OPTION_WAITFORRSP, 0, (void *)&dbm);
 
        lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);
        return ret;
@@ -2162,7 +1934,7 @@ static int wlan_get_essid(struct net_device *dev, struct iw_request_info *info,
        /*
         * Get the current SSID
         */
-       if (adapter->connect_status == libertas_connected) {
+       if (adapter->connect_status == LIBERTAS_CONNECTED) {
                memcpy(extra, adapter->curbssparams.ssid,
                       adapter->curbssparams.ssid_len);
                extra[adapter->curbssparams.ssid_len] = '\0';
@@ -2444,22 +2216,12 @@ static const iw_handler mesh_wlan_handler[] = {
 };
 struct iw_handler_def libertas_handler_def = {
        .num_standard   = sizeof(wlan_handler) / sizeof(iw_handler),
-       .num_private    = sizeof(wlan_private_handler) / sizeof(iw_handler),
-       .num_private_args = sizeof(wlan_private_args) /
-               sizeof(struct iw_priv_args),
        .standard       = (iw_handler *) wlan_handler,
-       .private        = (iw_handler *) wlan_private_handler,
-       .private_args   = (struct iw_priv_args *)wlan_private_args,
        .get_wireless_stats = wlan_get_wireless_stats,
 };
 
 struct iw_handler_def mesh_handler_def = {
        .num_standard   = sizeof(mesh_wlan_handler) / sizeof(iw_handler),
-       .num_private    = sizeof(wlan_private_handler) / sizeof(iw_handler),
-       .num_private_args = sizeof(wlan_private_args) /
-               sizeof(struct iw_priv_args),
        .standard       = (iw_handler *) mesh_wlan_handler,
-       .private        = (iw_handler *) wlan_private_handler,
-       .private_args   = (struct iw_priv_args *)wlan_private_args,
        .get_wireless_stats = wlan_get_wireless_stats,
 };