libertas: move to uniform lbs_/LBS_ namespace

This patch unifies the namespace of variables, functions defines
and structures. It does:

- rename libertas_XXX to lbs_XXX
- rename LIBERTAS_XXX to lbs_XXX
- rename wlan_XXX to lbs_XXX
- rename WLAN_XXX to LBS_XXX (but only those that were
  defined in libertas-local *.h files, e.g. not defines
  from net/ieee80211.h)

While passing, I fixed some checkpatch.pl errors too.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 137 insertions, 137 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index be5cfd8402c7..5b2a1c7c5f05 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -37,7 +37,7 @@ static u8 is_command_allowed_in_ps(__le16 command)
         return 0;
 }
 
-static int wlan_cmd_hw_spec(wlan_private * priv, struct cmd_ds_command *cmd)
+static int lbs_cmd_hw_spec(lbs_private * priv, struct cmd_ds_command *cmd)
 {
         struct cmd_ds_get_hw_spec *hwspec = &cmd->params.hwspec;
 
@@ -51,7 +51,7 @@ static int wlan_cmd_hw_spec(wlan_private * priv, struct cmd_ds_command *cmd)
         return 0;
 }
 
-static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
+static int lbs_cmd_802_11_ps_mode(lbs_private * priv,
                                    struct cmd_ds_command *cmd,
                                    u16 cmd_action)
 {
@@ -90,7 +90,7 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_inactivity_timeout(wlan_private * priv,
+static int lbs_cmd_802_11_inactivity_timeout(lbs_private * priv,
                                               struct cmd_ds_command *cmd,
                                               u16 cmd_action, void *pdata_buf)
 {
@@ -114,11 +114,11 @@ static int wlan_cmd_802_11_inactivity_timeout(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_sleep_params(wlan_private * priv,
+static int lbs_cmd_802_11_sleep_params(lbs_private * priv,
                                         struct cmd_ds_command *cmd,
                                         u16 cmd_action)
 {
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         struct cmd_ds_802_11_sleep_params *sp = &cmd->params.sleep_params;
 
         lbs_deb_enter(LBS_DEB_CMD);
@@ -145,13 +145,13 @@ static int wlan_cmd_802_11_sleep_params(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_set_wep(wlan_private * priv,
+static int lbs_cmd_802_11_set_wep(lbs_private * priv,
                                    struct cmd_ds_command *cmd,
                                    u32 cmd_act,
                                    void * pdata_buf)
 {
         struct cmd_ds_802_11_set_wep *wep = &cmd->params.wep;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         int ret = 0;
         struct assoc_request * assoc_req = pdata_buf;
 
@@ -219,7 +219,7 @@ done:
         return ret;
 }
 
-static int wlan_cmd_802_11_enable_rsn(wlan_private * priv,
+static int lbs_cmd_802_11_enable_rsn(lbs_private * priv,
                                       struct cmd_ds_command *cmd,
                                       u16 cmd_action,
                                       void * pdata_buf)
@@ -272,7 +272,7 @@ static void set_one_wpa_key(struct MrvlIEtype_keyParamSet * pkeyparamset,
         lbs_deb_leave(LBS_DEB_CMD);
 }
 
-static int wlan_cmd_802_11_key_material(wlan_private * priv,
+static int lbs_cmd_802_11_key_material(lbs_private * priv,
                                         struct cmd_ds_command *cmd,
                                         u16 cmd_action,
                                         u32 cmd_oid, void *pdata_buf)
@@ -319,7 +319,7 @@ done:
         return ret;
 }
 
-static int wlan_cmd_802_11_reset(wlan_private * priv,
+static int lbs_cmd_802_11_reset(lbs_private * priv,
                                  struct cmd_ds_command *cmd, int cmd_action)
 {
         struct cmd_ds_802_11_reset *reset = &cmd->params.reset;
@@ -334,7 +334,7 @@ static int wlan_cmd_802_11_reset(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_get_log(wlan_private * priv,
+static int lbs_cmd_802_11_get_log(lbs_private * priv,
                                    struct cmd_ds_command *cmd)
 {
         lbs_deb_enter(LBS_DEB_CMD);
@@ -346,7 +346,7 @@ static int wlan_cmd_802_11_get_log(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_get_stat(wlan_private * priv,
+static int lbs_cmd_802_11_get_stat(lbs_private * priv,
                                     struct cmd_ds_command *cmd)
 {
         lbs_deb_enter(LBS_DEB_CMD);
@@ -358,13 +358,13 @@ static int wlan_cmd_802_11_get_stat(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
+static int lbs_cmd_802_11_snmp_mib(lbs_private * priv,
                                     struct cmd_ds_command *cmd,
                                     int cmd_action,
                                     int cmd_oid, void *pdata_buf)
 {
         struct cmd_ds_802_11_snmp_mib *pSNMPMIB = &cmd->params.smib;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         u8 ucTemp;
 
         lbs_deb_enter(LBS_DEB_CMD);
@@ -479,11 +479,11 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_radio_control(wlan_private * priv,
+static int lbs_cmd_802_11_radio_control(lbs_private * priv,
                                          struct cmd_ds_command *cmd,
                                          int cmd_action)
 {
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         struct cmd_ds_802_11_radio_control *pradiocontrol = &cmd->params.radio;
 
         lbs_deb_enter(LBS_DEB_CMD);
@@ -519,7 +519,7 @@ static int wlan_cmd_802_11_radio_control(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_rf_tx_power(wlan_private * priv,
+static int lbs_cmd_802_11_rf_tx_power(lbs_private * priv,
                                        struct cmd_ds_command *cmd,
                                        u16 cmd_action, void *pdata_buf)
 {
@@ -563,7 +563,7 @@ static int wlan_cmd_802_11_rf_tx_power(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_monitor_mode(wlan_private * priv,
+static int lbs_cmd_802_11_monitor_mode(lbs_private * priv,
                                       struct cmd_ds_command *cmd,
                                       u16 cmd_action, void *pdata_buf)
 {
@@ -583,13 +583,13 @@ static int wlan_cmd_802_11_monitor_mode(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_rate_adapt_rateset(wlan_private * priv,
+static int lbs_cmd_802_11_rate_adapt_rateset(lbs_private * priv,
                                               struct cmd_ds_command *cmd,
                                               u16 cmd_action)
 {
         struct cmd_ds_802_11_rate_adapt_rateset
         *rateadapt = &cmd->params.rateset;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         lbs_deb_enter(LBS_DEB_CMD);
         cmd->size =
@@ -605,12 +605,12 @@ static int wlan_cmd_802_11_rate_adapt_rateset(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_data_rate(wlan_private * priv,
+static int lbs_cmd_802_11_data_rate(lbs_private * priv,
                                      struct cmd_ds_command *cmd,
                                      u16 cmd_action)
 {
         struct cmd_ds_802_11_data_rate *pdatarate = &cmd->params.drate;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
@@ -621,7 +621,7 @@ static int wlan_cmd_802_11_data_rate(wlan_private * priv,
         pdatarate->action = cpu_to_le16(cmd_action);
 
         if (cmd_action == CMD_ACT_SET_TX_FIX_RATE) {
-                pdatarate->rates[0] = libertas_data_rate_to_fw_index(adapter->cur_rate);
+                pdatarate->rates[0] = lbs_data_rate_to_fw_index(adapter->cur_rate);
                 lbs_deb_cmd("DATA_RATE: set fixed 0x%02X\n",
                        adapter->cur_rate);
         } else if (cmd_action == CMD_ACT_SET_TX_AUTO) {
@@ -632,12 +632,12 @@ static int wlan_cmd_802_11_data_rate(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_mac_multicast_adr(wlan_private * priv,
+static int lbs_cmd_mac_multicast_adr(lbs_private * priv,
                                       struct cmd_ds_command *cmd,
                                       u16 cmd_action)
 {
         struct cmd_ds_mac_multicast_adr *pMCastAdr = &cmd->params.madr;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         lbs_deb_enter(LBS_DEB_CMD);
         cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mac_multicast_adr) +
@@ -655,7 +655,7 @@ static int wlan_cmd_mac_multicast_adr(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_rf_channel(wlan_private * priv,
+static int lbs_cmd_802_11_rf_channel(lbs_private * priv,
                                       struct cmd_ds_command *cmd,
                                       int option, void *pdata_buf)
 {
@@ -676,10 +676,10 @@ static int wlan_cmd_802_11_rf_channel(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_rssi(wlan_private * priv,
+static int lbs_cmd_802_11_rssi(lbs_private * priv,
                                 struct cmd_ds_command *cmd)
 {
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         lbs_deb_enter(LBS_DEB_CMD);
         cmd->command = cpu_to_le16(CMD_802_11_RSSI);
@@ -698,15 +698,15 @@ static int wlan_cmd_802_11_rssi(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_reg_access(wlan_private * priv,
+static int lbs_cmd_reg_access(lbs_private * priv,
                                struct cmd_ds_command *cmdptr,
                                u8 cmd_action, void *pdata_buf)
 {
-        struct wlan_offset_value *offval;
+        struct lbs_offset_value *offval;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        offval = (struct wlan_offset_value *)pdata_buf;
+        offval = (struct lbs_offset_value *)pdata_buf;
 
         switch (cmdptr->command) {
         case CMD_MAC_REG_ACCESS:
@@ -773,11 +773,11 @@ static int wlan_cmd_reg_access(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_mac_address(wlan_private * priv,
+static int lbs_cmd_802_11_mac_address(lbs_private * priv,
                                        struct cmd_ds_command *cmd,
                                        u16 cmd_action)
 {
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         lbs_deb_enter(LBS_DEB_CMD);
         cmd->command = cpu_to_le16(CMD_802_11_MAC_ADDRESS);
@@ -797,11 +797,11 @@ static int wlan_cmd_802_11_mac_address(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_802_11_eeprom_access(wlan_private * priv,
+static int lbs_cmd_802_11_eeprom_access(lbs_private * priv,
                                          struct cmd_ds_command *cmd,
                                          int cmd_action, void *pdata_buf)
 {
-        struct wlan_ioctl_regrdwr *ea = pdata_buf;
+        struct lbs_ioctl_regrdwr *ea = pdata_buf;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
@@ -819,7 +819,7 @@ static int wlan_cmd_802_11_eeprom_access(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_bt_access(wlan_private * priv,
+static int lbs_cmd_bt_access(lbs_private * priv,
                                struct cmd_ds_command *cmd,
                                u16 cmd_action, void *pdata_buf)
 {
@@ -857,7 +857,7 @@ static int wlan_cmd_bt_access(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_fwt_access(wlan_private * priv,
+static int lbs_cmd_fwt_access(lbs_private * priv,
                                struct cmd_ds_command *cmd,
                                u16 cmd_action, void *pdata_buf)
 {
@@ -879,7 +879,7 @@ static int wlan_cmd_fwt_access(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_mesh_access(wlan_private * priv,
+static int lbs_cmd_mesh_access(lbs_private * priv,
                                 struct cmd_ds_command *cmd,
                                 u16 cmd_action, void *pdata_buf)
 {
@@ -901,7 +901,7 @@ static int wlan_cmd_mesh_access(wlan_private * priv,
         return 0;
 }
 
-static int wlan_cmd_set_boot2_ver(wlan_private * priv,
+static int lbs_cmd_set_boot2_ver(lbs_private * priv,
                                 struct cmd_ds_command *cmd,
                                 u16 cmd_action, void *pdata_buf)
 {
@@ -913,10 +913,10 @@ static int wlan_cmd_set_boot2_ver(wlan_private * priv,
 }
 
 /*
- * Note: NEVER use libertas_queue_cmd() with addtail==0 other than for
+ * Note: NEVER use lbs_queue_cmd() with addtail==0 other than for
  * the command timer, because it does not account for queued commands.
  */
-void libertas_queue_cmd(wlan_adapter * adapter, struct cmd_ctrl_node *cmdnode, u8 addtail)
+void lbs_queue_cmd(lbs_adapter * adapter, struct cmd_ctrl_node *cmdnode, u8 addtail)
 {
         unsigned long flags;
         struct cmd_ds_command *cmdptr;
@@ -968,12 +968,12 @@ done:
  * For now - we are not performing the endian conversion the second time - but
  * for PS and DEEP_SLEEP we need to worry
  */
-static int DownloadcommandToStation(wlan_private * priv,
+static int DownloadcommandToStation(lbs_private * priv,
                                     struct cmd_ctrl_node *cmdnode)
 {
         unsigned long flags;
         struct cmd_ds_command *cmdptr;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         int ret = -1;
         u16 cmdsize;
         u16 command;
@@ -990,7 +990,7 @@ static int DownloadcommandToStation(wlan_private * priv,
         spin_lock_irqsave(&adapter->driver_lock, flags);
         if (!cmdptr || !cmdptr->size) {
                 lbs_deb_host("DNLD_CMD: cmdptr is NULL or zero\n");
-                __libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                __lbs_cleanup_and_insert_cmd(priv, cmdnode);
                 spin_unlock_irqrestore(&adapter->driver_lock, flags);
                 goto done;
         }
@@ -1015,7 +1015,7 @@ static int DownloadcommandToStation(wlan_private * priv,
                 lbs_deb_host("DNLD_CMD: hw_host_to_card failed\n");
                 spin_lock_irqsave(&adapter->driver_lock, flags);
                 adapter->cur_cmd_retcode = ret;
-                __libertas_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
+                __lbs_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
                 adapter->nr_cmd_pending--;
                 adapter->cur_cmd = NULL;
                 spin_unlock_irqrestore(&adapter->driver_lock, flags);
@@ -1038,7 +1038,7 @@ done:
         return ret;
 }
 
-static int wlan_cmd_mac_control(wlan_private * priv,
+static int lbs_cmd_mac_control(lbs_private * priv,
                                 struct cmd_ds_command *cmd)
 {
         struct cmd_ds_mac_control *mac = &cmd->params.macctrl;
@@ -1060,9 +1060,9 @@ static int wlan_cmd_mac_control(wlan_private * priv,
  *  This function inserts command node to cmdfreeq
  *  after cleans it. Requires adapter->driver_lock held.
  */
-void __libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node *ptempcmd)
+void __lbs_cleanup_and_insert_cmd(lbs_private * priv, struct cmd_ctrl_node *ptempcmd)
 {
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         if (!ptempcmd)
                 return;
@@ -1071,22 +1071,22 @@ void __libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node
         list_add_tail((struct list_head *)ptempcmd, &adapter->cmdfreeq);
 }
 
-static void libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node *ptempcmd)
+static void lbs_cleanup_and_insert_cmd(lbs_private * priv, struct cmd_ctrl_node *ptempcmd)
 {
         unsigned long flags;
 
         spin_lock_irqsave(&priv->adapter->driver_lock, flags);
-        __libertas_cleanup_and_insert_cmd(priv, ptempcmd);
+        __lbs_cleanup_and_insert_cmd(priv, ptempcmd);
         spin_unlock_irqrestore(&priv->adapter->driver_lock, flags);
 }
 
-int libertas_set_radio_control(wlan_private * priv)
+int lbs_set_radio_control(lbs_private * priv)
 {
         int ret = 0;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        ret = libertas_prepare_and_send_command(priv,
+        ret = lbs_prepare_and_send_command(priv,
                                     CMD_802_11_RADIO_CONTROL,
                                     CMD_ACT_SET,
                                     CMD_OPTION_WAITFORRSP, 0, NULL);
@@ -1098,14 +1098,14 @@ int libertas_set_radio_control(wlan_private * priv)
         return ret;
 }
 
-int libertas_set_mac_packet_filter(wlan_private * priv)
+int lbs_set_mac_packet_filter(lbs_private * priv)
 {
         int ret = 0;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
         /* Send MAC control command to station */
-        ret = libertas_prepare_and_send_command(priv,
+        ret = lbs_prepare_and_send_command(priv,
                                     CMD_MAC_CONTROL, 0, 0, 0, NULL);
 
         lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
@@ -1115,7 +1115,7 @@ int libertas_set_mac_packet_filter(wlan_private * priv)
 /**
  *  @brief This function prepare the command before send to firmware.
  *
- *  @param priv         A pointer to wlan_private structure
+ *  @param priv         A pointer to lbs_private structure
  *  @param cmd_no       command number
  *  @param cmd_action   command action: GET or SET
  *  @param wait_option  wait option: wait response or not
@@ -1123,13 +1123,13 @@ int libertas_set_mac_packet_filter(wlan_private * priv)
  *  @param pdata_buf    A pointer to informaion buffer
  *  @return             0 or -1
  */
-int libertas_prepare_and_send_command(wlan_private * priv,
+int lbs_prepare_and_send_command(lbs_private * priv,
                           u16 cmd_no,
                           u16 cmd_action,
                           u16 wait_option, u32 cmd_oid, void *pdata_buf)
 {
         int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         struct cmd_ctrl_node *cmdnode;
         struct cmd_ds_command *cmdptr;
         unsigned long flags;
@@ -1148,7 +1148,7 @@ int libertas_prepare_and_send_command(wlan_private * priv,
                 goto done;
         }
 
-        cmdnode = libertas_get_free_cmd_ctrl_node(priv);
+        cmdnode = lbs_get_free_cmd_ctrl_node(priv);
 
         if (cmdnode == NULL) {
                 lbs_deb_host("PREP_CMD: cmdnode is NULL\n");
@@ -1159,7 +1159,7 @@ int libertas_prepare_and_send_command(wlan_private * priv,
                 goto done;
         }
 
-        libertas_set_cmd_ctrl_node(priv, cmdnode, cmd_oid, wait_option, pdata_buf);
+        lbs_set_cmd_ctrl_node(priv, cmdnode, cmd_oid, wait_option, pdata_buf);
 
         cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr;
 
@@ -1167,7 +1167,7 @@ int libertas_prepare_and_send_command(wlan_private * priv,
 
         if (!cmdptr) {
                 lbs_deb_host("PREP_CMD: cmdptr is NULL\n");
-                libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                lbs_cleanup_and_insert_cmd(priv, cmdnode);
                 ret = -1;
                 goto done;
         }
@@ -1181,116 +1181,116 @@ int libertas_prepare_and_send_command(wlan_private * priv,
 
         switch (cmd_no) {
         case CMD_GET_HW_SPEC:
-                ret = wlan_cmd_hw_spec(priv, cmdptr);
+                ret = lbs_cmd_hw_spec(priv, cmdptr);
                 break;
         case CMD_802_11_PS_MODE:
-                ret = wlan_cmd_802_11_ps_mode(priv, cmdptr, cmd_action);
+                ret = lbs_cmd_802_11_ps_mode(priv, cmdptr, cmd_action);
                 break;
 
         case CMD_802_11_SCAN:
-                ret = libertas_cmd_80211_scan(priv, cmdptr, pdata_buf);
+                ret = lbs_cmd_80211_scan(priv, cmdptr, pdata_buf);
                 break;
 
         case CMD_MAC_CONTROL:
-                ret = wlan_cmd_mac_control(priv, cmdptr);
+                ret = lbs_cmd_mac_control(priv, cmdptr);
                 break;
 
         case CMD_802_11_ASSOCIATE:
         case CMD_802_11_REASSOCIATE:
-                ret = libertas_cmd_80211_associate(priv, cmdptr, pdata_buf);
+                ret = lbs_cmd_80211_associate(priv, cmdptr, pdata_buf);
                 break;
 
         case CMD_802_11_DEAUTHENTICATE:
-                ret = libertas_cmd_80211_deauthenticate(priv, cmdptr);
+                ret = lbs_cmd_80211_deauthenticate(priv, cmdptr);
                 break;
 
         case CMD_802_11_SET_WEP:
-                ret = wlan_cmd_802_11_set_wep(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_802_11_set_wep(priv, cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_802_11_AD_HOC_START:
-                ret = libertas_cmd_80211_ad_hoc_start(priv, cmdptr, pdata_buf);
+                ret = lbs_cmd_80211_ad_hoc_start(priv, cmdptr, pdata_buf);
                 break;
         case CMD_CODE_DNLD:
                 break;
 
         case CMD_802_11_RESET:
-                ret = wlan_cmd_802_11_reset(priv, cmdptr, cmd_action);
+                ret = lbs_cmd_802_11_reset(priv, cmdptr, cmd_action);
                 break;
 
         case CMD_802_11_GET_LOG:
-                ret = wlan_cmd_802_11_get_log(priv, cmdptr);
+                ret = lbs_cmd_802_11_get_log(priv, cmdptr);
                 break;
 
         case CMD_802_11_AUTHENTICATE:
-                ret = libertas_cmd_80211_authenticate(priv, cmdptr, pdata_buf);
+                ret = lbs_cmd_80211_authenticate(priv, cmdptr, pdata_buf);
                 break;
 
         case CMD_802_11_GET_STAT:
-                ret = wlan_cmd_802_11_get_stat(priv, cmdptr);
+                ret = lbs_cmd_802_11_get_stat(priv, cmdptr);
                 break;
 
         case CMD_802_11_SNMP_MIB:
-                ret = wlan_cmd_802_11_snmp_mib(priv, cmdptr,
+                ret = lbs_cmd_802_11_snmp_mib(priv, cmdptr,
                                                cmd_action, cmd_oid, pdata_buf);
                 break;
 
         case CMD_MAC_REG_ACCESS:
         case CMD_BBP_REG_ACCESS:
         case CMD_RF_REG_ACCESS:
-                ret = wlan_cmd_reg_access(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_reg_access(priv, cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_802_11_RF_CHANNEL:
-                ret = wlan_cmd_802_11_rf_channel(priv, cmdptr,
+                ret = lbs_cmd_802_11_rf_channel(priv, cmdptr,
                                                  cmd_action, pdata_buf);
                 break;
 
         case CMD_802_11_RF_TX_POWER:
-                ret = wlan_cmd_802_11_rf_tx_power(priv, cmdptr,
+                ret = lbs_cmd_802_11_rf_tx_power(priv, cmdptr,
                                                   cmd_action, pdata_buf);
                 break;
 
         case CMD_802_11_RADIO_CONTROL:
-                ret = wlan_cmd_802_11_radio_control(priv, cmdptr, cmd_action);
+                ret = lbs_cmd_802_11_radio_control(priv, cmdptr, cmd_action);
                 break;
 
         case CMD_802_11_DATA_RATE:
-                ret = wlan_cmd_802_11_data_rate(priv, cmdptr, cmd_action);
+                ret = lbs_cmd_802_11_data_rate(priv, cmdptr, cmd_action);
                 break;
         case CMD_802_11_RATE_ADAPT_RATESET:
-                ret = wlan_cmd_802_11_rate_adapt_rateset(priv,
+                ret = lbs_cmd_802_11_rate_adapt_rateset(priv,
                                                          cmdptr, cmd_action);
                 break;
 
         case CMD_MAC_MULTICAST_ADR:
-                ret = wlan_cmd_mac_multicast_adr(priv, cmdptr, cmd_action);
+                ret = lbs_cmd_mac_multicast_adr(priv, cmdptr, cmd_action);
                 break;
 
         case CMD_802_11_MONITOR_MODE:
-                ret = wlan_cmd_802_11_monitor_mode(priv, cmdptr,
+                ret = lbs_cmd_802_11_monitor_mode(priv, cmdptr,
                                           cmd_action, pdata_buf);
                 break;
 
         case CMD_802_11_AD_HOC_JOIN:
-                ret = libertas_cmd_80211_ad_hoc_join(priv, cmdptr, pdata_buf);
+                ret = lbs_cmd_80211_ad_hoc_join(priv, cmdptr, pdata_buf);
                 break;
 
         case CMD_802_11_RSSI:
-                ret = wlan_cmd_802_11_rssi(priv, cmdptr);
+                ret = lbs_cmd_802_11_rssi(priv, cmdptr);
                 break;
 
         case CMD_802_11_AD_HOC_STOP:
-                ret = libertas_cmd_80211_ad_hoc_stop(priv, cmdptr);
+                ret = lbs_cmd_80211_ad_hoc_stop(priv, cmdptr);
                 break;
 
         case CMD_802_11_ENABLE_RSN:
-                ret = wlan_cmd_802_11_enable_rsn(priv, cmdptr, cmd_action,
+                ret = lbs_cmd_802_11_enable_rsn(priv, cmdptr, cmd_action,
                                 pdata_buf);
                 break;
 
         case CMD_802_11_KEY_MATERIAL:
-                ret = wlan_cmd_802_11_key_material(priv, cmdptr, cmd_action,
+                ret = lbs_cmd_802_11_key_material(priv, cmdptr, cmd_action,
                                 cmd_oid, pdata_buf);
                 break;
 
@@ -1300,11 +1300,11 @@ int libertas_prepare_and_send_command(wlan_private * priv,
                 break;
 
         case CMD_802_11_MAC_ADDRESS:
-                ret = wlan_cmd_802_11_mac_address(priv, cmdptr, cmd_action);
+                ret = lbs_cmd_802_11_mac_address(priv, cmdptr, cmd_action);
                 break;
 
         case CMD_802_11_EEPROM_ACCESS:
-                ret = wlan_cmd_802_11_eeprom_access(priv, cmdptr,
+                ret = lbs_cmd_802_11_eeprom_access(priv, cmdptr,
                                                     cmd_action, pdata_buf);
                 break;
 
@@ -1322,17 +1322,17 @@ int libertas_prepare_and_send_command(wlan_private * priv,
                 goto done;
 
         case CMD_802_11D_DOMAIN_INFO:
-                ret = libertas_cmd_802_11d_domain_info(priv, cmdptr,
+                ret = lbs_cmd_802_11d_domain_info(priv, cmdptr,
                                                    cmd_no, cmd_action);
                 break;
 
         case CMD_802_11_SLEEP_PARAMS:
-                ret = wlan_cmd_802_11_sleep_params(priv, cmdptr, cmd_action);
+                ret = lbs_cmd_802_11_sleep_params(priv, cmdptr, cmd_action);
                 break;
         case CMD_802_11_INACTIVITY_TIMEOUT:
-                ret = wlan_cmd_802_11_inactivity_timeout(priv, cmdptr,
+                ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr,
                                                          cmd_action, pdata_buf);
-                libertas_set_cmd_ctrl_node(priv, cmdnode, 0, 0, pdata_buf);
+                lbs_set_cmd_ctrl_node(priv, cmdnode, 0, 0, pdata_buf);
                 break;
 
         case CMD_802_11_TPC_CFG:
@@ -1379,19 +1379,19 @@ int libertas_prepare_and_send_command(wlan_private * priv,
                 ret = 0;
                 break;
         case CMD_BT_ACCESS:
-                ret = wlan_cmd_bt_access(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_bt_access(priv, cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_FWT_ACCESS:
-                ret = wlan_cmd_fwt_access(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_fwt_access(priv, cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_MESH_ACCESS:
-                ret = wlan_cmd_mesh_access(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_mesh_access(priv, cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_SET_BOOT2_VER:
-                ret = wlan_cmd_set_boot2_ver(priv, cmdptr, cmd_action, pdata_buf);
+                ret = lbs_cmd_set_boot2_ver(priv, cmdptr, cmd_action, pdata_buf);
                 break;
 
         case CMD_GET_TSF:
@@ -1409,14 +1409,14 @@ int libertas_prepare_and_send_command(wlan_private * priv,
         /* return error, since the command preparation failed */
         if (ret != 0) {
                 lbs_deb_host("PREP_CMD: command preparation failed\n");
-                libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                lbs_cleanup_and_insert_cmd(priv, cmdnode);
                 ret = -1;
                 goto done;
         }
 
         cmdnode->cmdwaitqwoken = 0;
 
-        libertas_queue_cmd(adapter, cmdnode, 1);
+        lbs_queue_cmd(adapter, cmdnode, 1);
         wake_up_interruptible(&priv->waitq);
 
         if (wait_option & CMD_OPTION_WAITFORRSP) {
@@ -1439,23 +1439,23 @@ done:
         lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
         return ret;
 }
-EXPORT_SYMBOL_GPL(libertas_prepare_and_send_command);
+EXPORT_SYMBOL_GPL(lbs_prepare_and_send_command);
 
 /**
  *  @brief This function allocates the command buffer and link
  *  it to command free queue.
  *
- *  @param priv         A pointer to wlan_private structure
+ *  @param priv         A pointer to lbs_private structure
  *  @return             0 or -1
  */
-int libertas_allocate_cmd_buffer(wlan_private * priv)
+int lbs_allocate_cmd_buffer(lbs_private * priv)
 {
         int ret = 0;
         u32 ulbufsize;
         u32 i;
         struct cmd_ctrl_node *tempcmd_array;
         u8 *ptempvirtualaddr;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         lbs_deb_enter(LBS_DEB_HOST);
 
@@ -1484,7 +1484,7 @@ int libertas_allocate_cmd_buffer(wlan_private * priv)
 
         for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) {
                 init_waitqueue_head(&tempcmd_array[i].cmdwait_q);
-                libertas_cleanup_and_insert_cmd(priv, &tempcmd_array[i]);
+                lbs_cleanup_and_insert_cmd(priv, &tempcmd_array[i]);
         }
 
         ret = 0;
@@ -1497,15 +1497,15 @@ done:
 /**
  *  @brief This function frees the command buffer.
  *
- *  @param priv         A pointer to wlan_private structure
+ *  @param priv         A pointer to lbs_private structure
  *  @return             0 or -1
  */
-int libertas_free_cmd_buffer(wlan_private * priv)
+int lbs_free_cmd_buffer(lbs_private * priv)
 {
         u32 ulbufsize; /* Someone needs to die for this. Slowly and painfully */
         unsigned int i;
         struct cmd_ctrl_node *tempcmd_array;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
 
         lbs_deb_enter(LBS_DEB_HOST);
 
@@ -1541,13 +1541,13 @@ done:
  *  @brief This function gets a free command node if available in
  *  command free queue.
  *
- *  @param priv         A pointer to wlan_private structure
+ *  @param priv         A pointer to lbs_private structure
  *  @return cmd_ctrl_node A pointer to cmd_ctrl_node structure or NULL
  */
-struct cmd_ctrl_node *libertas_get_free_cmd_ctrl_node(wlan_private * priv)
+struct cmd_ctrl_node *lbs_get_free_cmd_ctrl_node(lbs_private * priv)
 {
         struct cmd_ctrl_node *tempnode;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         unsigned long flags;
 
         lbs_deb_enter(LBS_DEB_HOST);
@@ -1602,14 +1602,14 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode)
 /**
  *  @brief This function initializes the command node.
  *
- *  @param priv         A pointer to wlan_private structure
+ *  @param priv         A pointer to lbs_private structure
  *  @param ptempnode    A pointer to cmd_ctrl_node structure
  *  @param cmd_oid      cmd oid: treated as sub command
  *  @param wait_option  wait option: wait response or not
  *  @param pdata_buf    A pointer to informaion buffer
  *  @return             0 or -1
  */
-void libertas_set_cmd_ctrl_node(wlan_private * priv,
+void lbs_set_cmd_ctrl_node(lbs_private * priv,
                     struct cmd_ctrl_node *ptempnode,
                     u32 cmd_oid, u16 wait_option, void *pdata_buf)
 {
@@ -1630,19 +1630,19 @@ void libertas_set_cmd_ctrl_node(wlan_private * priv,
  *  pending queue. It will put fimware back to PS mode
  *  if applicable.
  *
- *  @param priv     A pointer to wlan_private structure
+ *  @param priv     A pointer to lbs_private structure
  *  @return        0 or -1
  */
-int libertas_execute_next_command(wlan_private * priv)
+int lbs_execute_next_command(lbs_private * priv)
 {
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         struct cmd_ctrl_node *cmdnode = NULL;
         struct cmd_ds_command *cmdptr;
         unsigned long flags;
         int ret = 0;
 
         // Debug group is LBS_DEB_THREAD and not LBS_DEB_HOST, because the
-        // only caller to us is libertas_thread() and we get even when a
+        // only caller to us is lbs_thread() and we get even when a
         // data packet is received
         lbs_deb_enter(LBS_DEB_THREAD);
 
@@ -1683,7 +1683,7 @@ int libertas_execute_next_command(wlan_private * priv)
                         /*
                          * 1. Non-PS command:
                          * Queue it. set needtowakeup to TRUE if current state
-                         * is SLEEP, otherwise call libertas_ps_wakeup to send Exit_PS.
+                         * is SLEEP, otherwise call lbs_ps_wakeup to send Exit_PS.
                          * 2. PS command but not Exit_PS:
                          * Ignore it.
                          * 3. PS command Exit_PS:
@@ -1702,7 +1702,7 @@ int libertas_execute_next_command(wlan_private * priv)
                                            since it is blocked in main_thread. */
                                         adapter->needtowakeup = 1;
                                 } else
-                                        libertas_ps_wakeup(priv, 0);
+                                        lbs_ps_wakeup(priv, 0);
 
                                 ret = 0;
                                 goto done;
@@ -1722,7 +1722,7 @@ int libertas_execute_next_command(wlan_private * priv)
                                         lbs_deb_host(
                                                "EXEC_NEXT_CMD: ignore ENTER_PS cmd\n");
                                         list_del((struct list_head *)cmdnode);
-                                        libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                                        lbs_cleanup_and_insert_cmd(priv, cmdnode);
 
                                         ret = 0;
                                         goto done;
@@ -1733,7 +1733,7 @@ int libertas_execute_next_command(wlan_private * priv)
                                         lbs_deb_host(
                                                "EXEC_NEXT_CMD: ignore EXIT_PS cmd in sleep\n");
                                         list_del((struct list_head *)cmdnode);
-                                        libertas_cleanup_and_insert_cmd(priv, cmdnode);
+                                        lbs_cleanup_and_insert_cmd(priv, cmdnode);
                                         adapter->needtowakeup = 1;
 
                                         ret = 0;
@@ -1753,9 +1753,9 @@ int libertas_execute_next_command(wlan_private * priv)
                  * check if in power save mode, if yes, put the device back
                  * to PS mode
                  */
-                if ((adapter->psmode != WLAN802_11POWERMODECAM) &&
+                if ((adapter->psmode != LBS802_11POWERMODECAM) &&
                     (adapter->psstate == PS_STATE_FULL_POWER) &&
-                    (adapter->connect_status == LIBERTAS_CONNECTED)) {
+                    (adapter->connect_status == LBS_CONNECTED)) {
                         if (adapter->secinfo.WPAenabled ||
                             adapter->secinfo.WPA2enabled) {
                                 /* check for valid WPA group keys */
@@ -1764,13 +1764,13 @@ int libertas_execute_next_command(wlan_private * priv)
                                         lbs_deb_host(
                                                "EXEC_NEXT_CMD: WPA enabled and GTK_SET"
                                                " go back to PS_SLEEP");
-                                        libertas_ps_sleep(priv, 0);
+                                        lbs_ps_sleep(priv, 0);
                                 }
                         } else {
                                 lbs_deb_host(
                                        "EXEC_NEXT_CMD: cmdpendingq empty, "
                                        "go back to PS_SLEEP");
-                                libertas_ps_sleep(priv, 0);
+                                lbs_ps_sleep(priv, 0);
                         }
                 }
         }
@@ -1781,7 +1781,7 @@ done:
         return ret;
 }
 
-void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str)
+void lbs_send_iwevcustom_event(lbs_private *priv, s8 *str)
 {
         union iwreq_data iwrq;
         u8 buf[50];
@@ -1805,10 +1805,10 @@ void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str)
         lbs_deb_leave(LBS_DEB_WEXT);
 }
 
-static int sendconfirmsleep(wlan_private * priv, u8 * cmdptr, u16 size)
+static int sendconfirmsleep(lbs_private *priv, u8 *cmdptr, u16 size)
 {
         unsigned long flags;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         int ret = 0;
 
         lbs_deb_enter(LBS_DEB_HOST);
@@ -1847,7 +1847,7 @@ static int sendconfirmsleep(wlan_private * priv, u8 * cmdptr, u16 size)
         return ret;
 }
 
-void libertas_ps_sleep(wlan_private * priv, int wait_option)
+void lbs_ps_sleep(lbs_private * priv, int wait_option)
 {
         lbs_deb_enter(LBS_DEB_HOST);
 
@@ -1856,7 +1856,7 @@ void libertas_ps_sleep(wlan_private * priv, int wait_option)
          * Remove this check if it is to be supported in IBSS mode also
          */
 
-        libertas_prepare_and_send_command(priv, CMD_802_11_PS_MODE,
+        lbs_prepare_and_send_command(priv, CMD_802_11_PS_MODE,
                               CMD_SUBCMD_ENTER_PS, wait_option, 0, NULL);
 
         lbs_deb_leave(LBS_DEB_HOST);
@@ -1865,19 +1865,19 @@ void libertas_ps_sleep(wlan_private * priv, int wait_option)
 /**
  *  @brief This function sends Exit_PS command to firmware.
  *
- *  @param priv         A pointer to wlan_private structure
+ *  @param priv         A pointer to lbs_private structure
  *  @param wait_option  wait response or not
  *  @return             n/a
  */
-void libertas_ps_wakeup(wlan_private * priv, int wait_option)
+void lbs_ps_wakeup(lbs_private * priv, int wait_option)
 {
         __le32 Localpsmode;
 
         lbs_deb_enter(LBS_DEB_HOST);
 
-        Localpsmode = cpu_to_le32(WLAN802_11POWERMODECAM);
+        Localpsmode = cpu_to_le32(LBS802_11POWERMODECAM);
 
-        libertas_prepare_and_send_command(priv, CMD_802_11_PS_MODE,
+        lbs_prepare_and_send_command(priv, CMD_802_11_PS_MODE,
                               CMD_SUBCMD_EXIT_PS,
                               wait_option, 0, &Localpsmode);
 
@@ -1888,14 +1888,14 @@ void libertas_ps_wakeup(wlan_private * priv, int wait_option)
  *  @brief This function checks condition and prepares to
  *  send sleep confirm command to firmware if ok.
  *
- *  @param priv         A pointer to wlan_private structure
+ *  @param priv         A pointer to lbs_private structure
  *  @param psmode       Power Saving mode
  *  @return             n/a
  */
-void libertas_ps_confirm_sleep(wlan_private * priv, u16 psmode)
+void lbs_ps_confirm_sleep(lbs_private * priv, u16 psmode)
 {
         unsigned long flags =0;
-        wlan_adapter *adapter = priv->adapter;
+        lbs_adapter *adapter = priv->adapter;
         u8 allowed = 1;
 
         lbs_deb_enter(LBS_DEB_HOST);
@@ -1917,8 +1917,8 @@ void libertas_ps_confirm_sleep(wlan_private * priv, u16 psmode)
         spin_unlock_irqrestore(&adapter->driver_lock, flags);
 
         if (allowed) {
-                lbs_deb_host("sending libertas_ps_confirm_sleep\n");
-                sendconfirmsleep(priv, (u8 *) & adapter->libertas_ps_confirm_sleep,
+                lbs_deb_host("sending lbs_ps_confirm_sleep\n");
+                sendconfirmsleep(priv, (u8 *) & adapter->lbs_ps_confirm_sleep,
                                  sizeof(struct PS_CMD_ConfirmSleep));
         } else {
                 lbs_deb_host("sleep confirm has been delayed\n");