This fixes the naming of the remaining global symbols in the libertas driver. Signed-off-by: Arnd Bergmann Index: linus-2.6/drivers/net/wireless/libertas/if_usb.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/if_usb.c +++ linus-2.6/drivers/net/wireless/libertas/if_usb.c @@ -112,7 +112,7 @@ MODULE_DEVICE_TABLE(usb, if_usb_table); */ static void if_usb_interrupt(wlan_private * priv, u8 flags, int context) { - wlan_interrupt(priv->wlan_dev.netdev); + libertas_interrupt(priv->wlan_dev.netdev); } /** @@ -291,7 +291,7 @@ static int if_usb_probe(struct usb_inter /* At this point wlan_add_card() will be called. Don't worry * about keeping pwlanpriv around since it will be set on our - * usb device data in -> add() -> sbi_register_dev(). + * usb device data in -> add() -> libertas_sbi_register_dev(). */ if (!(pwlanpriv = usb_cardp->add(usb_cardp))) { goto dealloc; @@ -601,7 +601,7 @@ static void if_usb_receive(struct urb *u skb_reserve(skb, IPFIELD_ALIGN_OFFSET); skb_put(skb, RecvLength); skb_pull(skb, MESSAGE_HEADER_LEN); - ProcessRxedPacket(priv, skb); + libertas_process_rxed_packet(priv, skb); priv->wlan_dev.upld_len = (RecvLength - MESSAGE_HEADER_LEN); @@ -641,7 +641,7 @@ static void if_usb_receive(struct urb *u PRINTM(INFO, "**EVENT** 0x%X\n", cardp->usb_event_cause); if (cardp->usb_event_cause & 0xffff0000) { - SendTxFeedback(priv); + libertas_send_tx_feedback(priv); break; } cardp->usb_event_cause = wlan_le32_to_cpu(cardp->usb_event_cause) << 3; @@ -670,7 +670,7 @@ rx_exit: * @param len number of bytes * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb) +int libertas_sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb) { int ret = WLAN_STATUS_FAILURE; u32 tmp; @@ -707,12 +707,12 @@ int sbi_host_to_card(wlan_private * priv * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_reenable_host_interrupt(wlan_private * priv, u8 bits) +int libertas_sbi_reenable_host_interrupt(wlan_private * priv, u8 bits) { return WLAN_STATUS_SUCCESS; } -int sbi_get_int_status(wlan_private * priv, u8 * ireg) +int libertas_sbi_get_int_status(wlan_private * priv, u8 * ireg) { unsigned long flags; ENTER(); @@ -734,7 +734,7 @@ int sbi_get_int_status(wlan_private * pr * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_read_event_cause(wlan_private * priv) +int libertas_sbi_read_event_cause(wlan_private * priv) { struct usb_card_rec *cardp = priv->wlan_dev.card; priv->adapter->EventCause = cardp->usb_event_cause; @@ -748,7 +748,7 @@ int sbi_read_event_cause(wlan_private * * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_get_cis_info(wlan_private * priv) +int libertas_sbi_get_cis_info(wlan_private * priv) { return WLAN_STATUS_SUCCESS; } @@ -757,7 +757,7 @@ static int reset_device(wlan_private *pr { int ret; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RESET, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RESET, HostCmd_ACT_HALT, 0, 0, NULL); msleep_interruptible(10); @@ -768,7 +768,7 @@ static int reset_device(wlan_private *pr * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_unregister_dev(wlan_private * priv) +int libertas_sbi_unregister_dev(wlan_private * priv) { int ret = WLAN_STATUS_SUCCESS; @@ -789,7 +789,7 @@ int sbi_unregister_dev(wlan_private * pr * @param arg pointer to call back function parameter * @return dummy success variable */ -int *sbi_register(wlan_notifier_fn_add add, wlan_notifier_fn_remove remove, +int *libertas_sbi_register(wlan_notifier_fn_add add, wlan_notifier_fn_remove remove, void *arg) { ENTER(); @@ -813,7 +813,7 @@ int *sbi_register(wlan_notifier_fn_add a * @brief This function removes usb driver. * @return N/A */ -void sbi_unregister(void) +void libertas_sbi_unregister(void) { ENTER(); @@ -832,7 +832,7 @@ void sbi_unregister(void) * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_probe_card(void *card_p) +int libertas_sbi_probe_card(void *card_p) { return WLAN_STATUS_SUCCESS; } @@ -842,7 +842,7 @@ int sbi_probe_card(void *card_p) * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int sbi_register_dev(wlan_private * priv) +int libertas_sbi_register_dev(wlan_private * priv) { struct usb_card_rec *cardp = (struct usb_card_rec *)priv->wlan_dev.card; @@ -858,7 +858,7 @@ int sbi_register_dev(wlan_private * priv PRINTM(INFO, "cardp = %p priv = %p\n", cardp, priv); if (if_usb_submit_rx_urb_fwload(priv) < 0) { PRINTM(INFO, "URB submission is failed\n"); - sbi_unregister(); + libertas_sbi_unregister(); LEAVE(); return WLAN_STATUS_FAILURE; } @@ -876,7 +876,7 @@ int sbi_register_dev(wlan_private * priv * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_verify_fw_download(wlan_private * priv) +int libertas_sbi_verify_fw_download(wlan_private * priv) { return WLAN_STATUS_SUCCESS; } @@ -957,7 +957,7 @@ static int if_prog_firmware(wlan_private * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_prog_firmware(wlan_private * priv) +int libertas_sbi_prog_firmware(wlan_private * priv) { struct usb_card_rec *cardp = priv->wlan_dev.card; int i = 0; @@ -1014,7 +1014,7 @@ restart: * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_enable_host_int(wlan_private * priv) +int libertas_sbi_enable_host_int(wlan_private * priv) { return WLAN_STATUS_SUCCESS; } @@ -1024,7 +1024,7 @@ int sbi_enable_host_int(wlan_private * p * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -int sbi_disable_host_int(wlan_private * priv) +int libertas_sbi_disable_host_int(wlan_private * priv) { return WLAN_STATUS_SUCCESS; } @@ -1035,7 +1035,7 @@ int sbi_disable_host_int(wlan_private * * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -inline int sbi_suspend(wlan_private * priv) +inline int libertas_sbi_suspend(wlan_private * priv) { return WLAN_STATUS_SUCCESS; } @@ -1045,7 +1045,7 @@ inline int sbi_suspend(wlan_private * pr * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS */ -inline int sbi_resume(wlan_private * priv) +inline int libertas_sbi_resume(wlan_private * priv) { return WLAN_STATUS_SUCCESS; } Index: linus-2.6/drivers/net/wireless/libertas/wlan_cmd.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_cmd.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_cmd.c @@ -884,7 +884,7 @@ static int wlan_cmd_802_11_data_rate(wla pDataRate->Action = wlan_cpu_to_le16(cmd_action); if (Action == HostCmd_ACT_SET_TX_FIX_RATE) { - pDataRate->DataRate[0] = data_rate_to_index(Adapter->DataRate); + pDataRate->DataRate[0] = libertas_data_rate_to_index(Adapter->DataRate); PRINTM(INFO, "Setting FW for fixed rate 0x%02X\n", Adapter->DataRate); } else if (Action == HostCmd_ACT_SET_TX_AUTO) { @@ -1192,7 +1192,7 @@ static int wlan_cmd_dft_access(wlan_priv * @param addtail specify if the cmd needs to be queued in the header or tail * @return n/a */ -void QueueCmd(wlan_adapter * Adapter, struct CmdCtrlNode *CmdNode, u8 addtail) +void libertas_queue_cmd(wlan_adapter * Adapter, struct CmdCtrlNode *CmdNode, u8 addtail) { ulong flags; struct HostCmd_DS_COMMAND *CmdPtr; @@ -1269,7 +1269,7 @@ static int DownloadCommandToStation(wlan PRINTM(INFO, "DNLD_CMD: Adapter = %#x, CmdNode = %#x\n", (int)Adapter, (int)CmdNode); if (CmdNode) - CleanupAndInsertCmd(priv, CmdNode); + libertas_cleanup_and_insert_cmd(priv, CmdNode); ret = WLAN_STATUS_FAILURE; goto done; } @@ -1279,7 +1279,7 @@ static int DownloadCommandToStation(wlan if (!CmdPtr || !CmdPtr->Size) { PRINTM(INFO, "DNLD_CMD: CmdPtr is Null or Cmd Size is Zero, " "Not sending\n"); - CleanupAndInsertCmd(priv, CmdNode); + libertas_cleanup_and_insert_cmd(priv, CmdNode); ret = WLAN_STATUS_FAILURE; goto done; } @@ -1298,11 +1298,11 @@ static int DownloadCommandToStation(wlan CmdNode->CmdWaitQWoken = 0; CmdSize = wlan_cpu_to_le16(CmdSize); - ret = sbi_host_to_card(priv, MVMS_CMD, (u8 *) CmdPtr, CmdSize); + ret = libertas_sbi_host_to_card(priv, MVMS_CMD, (u8 *) CmdPtr, CmdSize); if (ret != 0) { PRINTM(INFO, "DNLD_CMD: Host to Card Failed\n"); - CleanupAndInsertCmd(priv, Adapter->CurCmd); + libertas_cleanup_and_insert_cmd(priv, Adapter->CurCmd); spin_lock_irqsave(&Adapter->QueueSpinLock, flags); Adapter->CurCmd = NULL; spin_unlock_irqrestore(&Adapter->QueueSpinLock, flags); @@ -1362,7 +1362,7 @@ static int wlan_cmd_mac_control(wlan_pri * @param pTempCmd A pointer to CmdCtrlNode structure * @return n/a */ -void CleanupAndInsertCmd(wlan_private * priv, struct CmdCtrlNode *pTempCmd) +void libertas_cleanup_and_insert_cmd(wlan_private * priv, struct CmdCtrlNode *pTempCmd) { ulong flags; wlan_adapter *Adapter = priv->adapter; @@ -1387,13 +1387,13 @@ void CleanupAndInsertCmd(wlan_private * * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int SetRadioControl(wlan_private * priv) +int libertas_set_radio_control(wlan_private * priv) { int ret = WLAN_STATUS_SUCCESS; ENTER(); - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RADIO_CONTROL, HostCmd_ACT_GEN_SET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -1411,17 +1411,17 @@ int SetRadioControl(wlan_private * priv) * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int SetMacPacketFilter(wlan_private * priv) +int libertas_set_mac_packet_filter(wlan_private * priv) { int ret = WLAN_STATUS_SUCCESS; ENTER(); - PRINTM(INFO, "SetMacPacketFilter Value = %x\n", + PRINTM(INFO, "libertas_set_mac_packet_filter Value = %x\n", priv->adapter->CurrentPacketFilter); /* Send MAC control command to station */ - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_MAC_CONTROL, 0, 0, 0, NULL); LEAVE(); @@ -1439,7 +1439,7 @@ int SetMacPacketFilter(wlan_private * pr * @param pdata_buf A pointer to informaion buffer * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int PrepareAndSendCommand(wlan_private * priv, +int libertas_prepare_and_send_command(wlan_private * priv, u16 cmd_no, u16 cmd_action, u16 wait_option, u32 cmd_oid, void *pdata_buf) @@ -1463,7 +1463,7 @@ int PrepareAndSendCommand(wlan_private * goto done; } - CmdNode = GetFreeCmdCtrlNode(priv); + CmdNode = libertas_get_free_cmd_ctrl_node(priv); if (CmdNode == NULL) { PRINTM(MSG, "PREP_CMD: No free CmdNode\n"); @@ -1474,7 +1474,7 @@ int PrepareAndSendCommand(wlan_private * goto done; } - SetCmdCtrlNode(priv, CmdNode, cmd_oid, wait_option, pdata_buf); + libertas_set_cmd_ctrl_node(priv, CmdNode, cmd_oid, wait_option, pdata_buf); CmdPtr = (struct HostCmd_DS_COMMAND *)CmdNode->BufVirtualAddr; @@ -1483,7 +1483,7 @@ int PrepareAndSendCommand(wlan_private * if (!CmdPtr) { PRINTM(MSG, "PREP_CMD: BufVirtualAddr of CmdNode is NULL\n"); - CleanupAndInsertCmd(priv, CmdNode); + libertas_cleanup_and_insert_cmd(priv, CmdNode); ret = WLAN_STATUS_FAILURE; goto done; } @@ -1639,7 +1639,7 @@ int PrepareAndSendCommand(wlan_private * goto done; case HostCmd_CMD_802_11D_DOMAIN_INFO: - ret = wlan_cmd_802_11d_domain_info(priv, CmdPtr, + ret = libertas_cmd_802_11d_domain_info(priv, CmdPtr, cmd_no, cmd_action); break; @@ -1649,7 +1649,7 @@ int PrepareAndSendCommand(wlan_private * case HostCmd_CMD_802_11_INACTIVITY_TIMEOUT: ret = wlan_cmd_802_11_inactivity_timeout(priv, CmdPtr, cmd_action, pdata_buf); - SetCmdCtrlNode(priv, CmdNode, 0, 0, pdata_buf); + libertas_set_cmd_ctrl_node(priv, CmdNode, 0, 0, pdata_buf); break; case HostCmd_CMD_802_11_TPC_CFG: @@ -1729,17 +1729,17 @@ int PrepareAndSendCommand(wlan_private * /* return error, since the command preparation failed */ if (ret != WLAN_STATUS_SUCCESS) { PRINTM(INFO, "PREP_CMD: Command preparation failed\n"); - CleanupAndInsertCmd(priv, CmdNode); + libertas_cleanup_and_insert_cmd(priv, CmdNode); ret = WLAN_STATUS_FAILURE; goto done; } CmdNode->CmdWaitQWoken = 0; - QueueCmd(Adapter, CmdNode, 1); + libertas_queue_cmd(Adapter, CmdNode, 1); wake_up_interruptible(&priv->MainThread.waitQ); - sbi_reenable_host_interrupt(priv, 0x00); + libertas_sbi_reenable_host_interrupt(priv, 0x00); if (wait_option & HostCmd_OPTION_WAITFORRSP) { PRINTM(INFO, "PREP_CMD: Wait for CMD response\n"); @@ -1766,7 +1766,7 @@ int PrepareAndSendCommand(wlan_private * * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int AllocateCmdBuffer(wlan_private * priv) +int libertas_allocate_cmd_buffer(wlan_private * priv) { int ret = WLAN_STATUS_SUCCESS; u32 ulBufSize; @@ -1808,7 +1808,7 @@ int AllocateCmdBuffer(wlan_private * pri for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { init_waitqueue_head(&TempCmdArray[i].cmdwait_q); - CleanupAndInsertCmd(priv, &TempCmdArray[i]); + libertas_cleanup_and_insert_cmd(priv, &TempCmdArray[i]); } ret = WLAN_STATUS_SUCCESS; @@ -1823,7 +1823,7 @@ int AllocateCmdBuffer(wlan_private * pri * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int FreeCmdBuffer(wlan_private * priv) +int libertas_free_cmd_buffer(wlan_private * priv) { u32 ulBufSize; unsigned int i; @@ -1869,7 +1869,7 @@ int FreeCmdBuffer(wlan_private * priv) * @param priv A pointer to wlan_private structure * @return CmdCtrlNode A pointer to CmdCtrlNode structure or NULL */ -struct CmdCtrlNode *GetFreeCmdCtrlNode(wlan_private * priv) +struct CmdCtrlNode *libertas_get_free_cmd_ctrl_node(wlan_private * priv) { struct CmdCtrlNode *TempNode; wlan_adapter *Adapter = priv->adapter; @@ -1939,7 +1939,7 @@ static void CleanUpCmdCtrlNode(struct Cm * @param pdata_buf A pointer to informaion buffer * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -void SetCmdCtrlNode(wlan_private * priv, +void libertas_set_cmd_ctrl_node(wlan_private * priv, struct CmdCtrlNode *pTempNode, u32 cmd_oid, u16 wait_option, void *pdata_buf) { @@ -1963,7 +1963,7 @@ void SetCmdCtrlNode(wlan_private * priv, * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int ExecuteNextCommand(wlan_private * priv) +int libertas_execute_next_command(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; struct CmdCtrlNode *CmdNode = NULL; @@ -2017,7 +2017,7 @@ int ExecuteNextCommand(wlan_private * pr /* * 1. Non-PS command: * Queue it. set NeedToWakeup to TRUE if current state - * is SLEEP, otherwise call PSWakeup to send Exit_PS. + * is SLEEP, otherwise call libertas_ps_wakeup to send Exit_PS. * 2. PS command but not Exit_PS: * Ignore it. * 3. PS command Exit_PS: @@ -2036,7 +2036,7 @@ int ExecuteNextCommand(wlan_private * pr since it is blocked in main_thread. */ Adapter->NeedToWakeup = 1; } else - PSWakeup(priv, 0); + libertas_ps_wakeup(priv, 0); ret = WLAN_STATUS_SUCCESS; goto done; @@ -2056,7 +2056,7 @@ int ExecuteNextCommand(wlan_private * pr PRINTM(INFO, "EXEC_NEXT_CMD: Ignore Enter PS cmd\n"); list_del((struct list_head *)CmdNode); - CleanupAndInsertCmd(priv, CmdNode); + libertas_cleanup_and_insert_cmd(priv, CmdNode); ret = WLAN_STATUS_SUCCESS; goto done; @@ -2068,7 +2068,7 @@ int ExecuteNextCommand(wlan_private * pr PRINTM(INFO, "EXEC_NEXT_CMD: Ignore ExitPS cmd in sleep\n"); list_del((struct list_head *)CmdNode); - CleanupAndInsertCmd(priv, CmdNode); + libertas_cleanup_and_insert_cmd(priv, CmdNode); Adapter->NeedToWakeup = 1; ret = WLAN_STATUS_SUCCESS; @@ -2097,13 +2097,13 @@ int ExecuteNextCommand(wlan_private * pr PRINTM(INFO, "EXEC_NEXT_CMD: WPA enabled and GTK_SET" " go back to PS_SLEEP"); - PSSleep(priv, 0); + libertas_ps_sleep(priv, 0); } } else { PRINTM(INFO, "EXEC_NEXT_CMD: Command PendQ is empty," " go back to PS_SLEEP"); - PSSleep(priv, 0); + libertas_ps_sleep(priv, 0); } } } @@ -2121,7 +2121,7 @@ int ExecuteNextCommand(wlan_private * pr * @para str A pointer to event string * @return n/a */ -void send_iwevcustom_event(wlan_private * priv, s8 * str) +void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str) { union iwreq_data iwrq; u8 buf[50]; @@ -2169,7 +2169,7 @@ static int SendConfirmSleep(wlan_private HEXDUMP("SEND_SLEEPC_CMD: Sleep confirm Command", CmdPtr, size); - ret = sbi_host_to_card(priv, MVMS_CMD, CmdPtr, size); + ret = libertas_sbi_host_to_card(priv, MVMS_CMD, CmdPtr, size); priv->wlan_dev.dnld_sent = DNLD_RES_RECEIVED; if (Adapter->IntCounter || Adapter->CurrentTxSkb) PRINTM(INFO, "SEND_SLEEPC_CMD: IntCounter=%d CurrentTxSkb=%p\n", @@ -2203,7 +2203,7 @@ static int SendConfirmSleep(wlan_private * @param wait_option wait response or not * @return n/a */ -void PSSleep(wlan_private * priv, int wait_option) +void libertas_ps_sleep(wlan_private * priv, int wait_option) { ENTER(); @@ -2213,7 +2213,7 @@ void PSSleep(wlan_private * priv, int wa * Remove this check if it is to be supported in IBSS mode also */ - PrepareAndSendCommand(priv, HostCmd_CMD_802_11_PS_MODE, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_PS_MODE, HostCmd_SubCmd_Enter_PS, wait_option, 0, NULL); LEAVE(); @@ -2227,7 +2227,7 @@ void PSSleep(wlan_private * priv, int wa * @param wait_option wait response or not * @return n/a */ -void PSWakeup(wlan_private * priv, int wait_option) +void libertas_ps_wakeup(wlan_private * priv, int wait_option) { enum WLAN_802_11_POWER_MODE LocalPSMode; @@ -2237,7 +2237,7 @@ void PSWakeup(wlan_private * priv, int w PRINTM(INFO, "Exit_PS: LocalPSMode = %d\n", LocalPSMode); - PrepareAndSendCommand(priv, HostCmd_CMD_802_11_PS_MODE, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_PS_MODE, HostCmd_SubCmd_Exit_PS, wait_option, 0, &LocalPSMode); @@ -2253,7 +2253,7 @@ void PSWakeup(wlan_private * priv, int w * @param PSMode Power Saving mode * @return n/a */ -void PSConfirmSleep(wlan_private * priv, u16 PSMode) +void libertas_ps_confirm_sleep(wlan_private * priv, u16 PSMode) { wlan_adapter *Adapter = priv->adapter; u8 allowed = 1; @@ -2272,8 +2272,8 @@ void PSConfirmSleep(wlan_private * priv, } if (allowed) { - PRINTM(INFO, "Sending PSConfirmSleep\n"); - SendConfirmSleep(priv, (u8 *) & Adapter->PSConfirmSleep, + PRINTM(INFO, "Sending libertas_ps_confirm_sleep\n"); + SendConfirmSleep(priv, (u8 *) & Adapter->libertas_ps_confirm_sleep, sizeof(struct PS_CMD_ConfirmSleep)); } else { PRINTM(INFO, "Sleep Confirm has been delayed\n"); Index: linus-2.6/drivers/net/wireless/libertas/wlan_cmdresp.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_cmdresp.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_cmdresp.c @@ -132,7 +132,7 @@ void libertas_mac_event_disconnected(wla if (Adapter->PSState != PS_STATE_FULL_POWER) { /* make firmware to exit PS mode */ PRINTM(INFO, "Disconnected, so exit PS mode.\n"); - PSWakeup(priv, 0); + libertas_ps_wakeup(priv, 0); } LEAVE(); @@ -185,7 +185,7 @@ static void HandleMICFailureEvent(wlan_p strcat(buf, "multicast "); } - send_iwevcustom_event(priv, buf); + libertas_send_iwevcustom_event(priv, buf); LEAVE(); } @@ -308,12 +308,12 @@ static int wlan_ret_get_hw_spec(wlan_pri memcpy(priv->wlan_dev.netdev->dev_addr, Adapter->CurrentAddr, ETH_ALEN); - if (wlan_set_regiontable(priv, Adapter->RegionCode, 0)) { + if (libertas_set_regiontable(priv, Adapter->RegionCode, 0)) { ret = WLAN_STATUS_FAILURE; goto done; } - if (wlan_set_universaltable(priv, 0)) { + if (libertas_set_universaltable(priv, 0)) { ret = WLAN_STATUS_FAILURE; goto done; } @@ -664,7 +664,7 @@ static int wlan_ret_802_11_data_rate(wla memcpy(Adapter->libertas_supported_rates, pDataRate->DataRate, sizeof(Adapter->libertas_supported_rates)); } - Adapter->DataRate = index_to_data_rate(Dot11DataRate); + Adapter->DataRate = libertas_index_to_data_rate(Dot11DataRate); LEAVE(); return WLAN_STATUS_SUCCESS; @@ -797,7 +797,7 @@ static int wlan_ret_get_log(wlan_private * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_process_rx_command(wlan_private * priv) +int libertas_process_rx_command(wlan_private * priv) { u16 RespCmd; struct HostCmd_DS_COMMAND *resp; @@ -833,7 +833,7 @@ int wlan_process_rx_command(wlan_private if (!(RespCmd & 0x8000)) { PRINTM(INFO, "Invalid response to command!"); Adapter->CurCmdRetCode = WLAN_STATUS_FAILURE; - CleanupAndInsertCmd(priv, Adapter->CurCmd); + libertas_cleanup_and_insert_cmd(priv, Adapter->CurCmd); spin_lock_irqsave(&Adapter->QueueSpinLock, flags); Adapter->CurCmd = NULL; spin_unlock_irqrestore(&Adapter->QueueSpinLock, flags); @@ -861,7 +861,7 @@ int wlan_process_rx_command(wlan_private /* * We should not re-try enter-ps command in * ad-hoc mode. It takes place in - * ExecuteNextCommand(). + * libertas_execute_next_command(). */ if (psmode->Action == HostCmd_SubCmd_Enter_PS) Adapter->PSMode = @@ -879,8 +879,8 @@ int wlan_process_rx_command(wlan_private * response, We need to wake up the firmware. */ PRINTM(INFO, - "Disconnected, Going to invoke PSWakeup\n"); - PSWakeup(priv, 0); + "Disconnected, Going to invoke libertas_ps_wakeup\n"); + libertas_ps_wakeup(priv, 0); } } else if (psmode->Action == HostCmd_SubCmd_Exit_PS) { Adapter->NeedToWakeup = 0; @@ -891,7 +891,7 @@ int wlan_process_rx_command(wlan_private psmode->Action); } - CleanupAndInsertCmd(priv, Adapter->CurCmd); + libertas_cleanup_and_insert_cmd(priv, Adapter->CurCmd); spin_lock_irqsave(&Adapter->QueueSpinLock, flags); Adapter->CurCmd = NULL; spin_unlock_irqrestore(&Adapter->QueueSpinLock, flags); @@ -923,7 +923,7 @@ int wlan_process_rx_command(wlan_private } - CleanupAndInsertCmd(priv, Adapter->CurCmd); + libertas_cleanup_and_insert_cmd(priv, Adapter->CurCmd); spin_lock_irqsave(&Adapter->QueueSpinLock, flags); Adapter->CurCmd = NULL; spin_unlock_irqrestore(&Adapter->QueueSpinLock, flags); @@ -1049,7 +1049,7 @@ int wlan_process_rx_command(wlan_private break; case HostCmd_RET_802_11D_DOMAIN_INFO: - ret = wlan_ret_802_11d_domain_info(priv, resp); + ret = libertas_ret_802_11d_domain_info(priv, resp); break; case HostCmd_RET_802_11_SLEEP_PARAMS: @@ -1100,7 +1100,7 @@ int wlan_process_rx_command(wlan_private if (Adapter->CurCmd) { /* Clean up and Put current command back to CmdFreeQ */ - CleanupAndInsertCmd(priv, Adapter->CurCmd); + libertas_cleanup_and_insert_cmd(priv, Adapter->CurCmd); spin_lock_irqsave(&Adapter->QueueSpinLock, flags); Adapter->CurCmd = NULL; spin_unlock_irqrestore(&Adapter->QueueSpinLock, flags); @@ -1117,7 +1117,7 @@ int wlan_process_rx_command(wlan_private * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_process_event(wlan_private * priv) +int libertas_process_event(wlan_private * priv) { int ret = WLAN_STATUS_SUCCESS; wlan_adapter *Adapter = priv->adapter; @@ -1158,7 +1158,7 @@ int wlan_process_event(wlan_private * pr } Adapter->PSState = PS_STATE_PRE_SLEEP; - PSConfirmSleep(priv, (u16) Adapter->PSMode); + libertas_ps_confirm_sleep(priv, (u16) Adapter->PSMode); break; @@ -1174,9 +1174,9 @@ int wlan_process_event(wlan_private * pr } Adapter->TxLockFlag = 0; - if (CheckLastPacketIndication(priv)) { + if (libertas_check_last_packet_indication(priv)) { if (Adapter->gen_null_pkg) { - SendNullPacket(priv, + libertas_send_null_packet(priv, MRVDRV_TxPD_POWER_MGMT_NULL_PACKET | MRVDRV_TxPD_POWER_MGMT_LAST_PACKET); @@ -1191,10 +1191,10 @@ int wlan_process_event(wlan_private * pr * wait for the command processing to finish * before resuming sending * Adapter->NeedToWakeup will be set to FALSE - * in PSWakeup() + * in libertas_ps_wakeup() */ PRINTM(INFO, "Waking up...\n"); - PSWakeup(priv, 0); + libertas_ps_wakeup(priv, 0); } break; Index: linus-2.6/drivers/net/wireless/libertas/wlan_decl.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_decl.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_decl.h @@ -39,78 +39,72 @@ struct wlan_private; struct sk_buff; struct net_device; -int wlan_tx_packet(wlan_private * priv, struct sk_buff *skb); -void wlan_free_adapter(wlan_private * priv); -int SetMacPacketFilter(wlan_private * priv); - -int SendNullPacket(wlan_private * priv, u8 pwr_mgmt); -void SendTxFeedback(wlan_private * priv); -u8 CheckLastPacketIndication(wlan_private * priv); +void libertas_free_adapter(wlan_private * priv); +int libertas_set_mac_packet_filter(wlan_private * priv); -void Wep_encrypt(wlan_private * priv, u8 * Buf, u32 Len); -int FreeCmdBuffer(wlan_private * priv); +int libertas_send_null_packet(wlan_private * priv, u8 pwr_mgmt); +void libertas_send_tx_feedback(wlan_private * priv); +u8 libertas_check_last_packet_indication(wlan_private * priv); + +int libertas_free_cmd_buffer(wlan_private * priv); struct CmdCtrlNode; -struct CmdCtrlNode *GetFreeCmdCtrlNode(wlan_private * priv); +struct CmdCtrlNode *libertas_get_free_cmd_ctrl_node(wlan_private * priv); -void SetCmdCtrlNode(wlan_private * priv, +void libertas_set_cmd_ctrl_node(wlan_private * priv, struct CmdCtrlNode *pTempNode, u32 cmd_oid, u16 wait_option, void *pdata_buf); -int PrepareAndSendCommand(wlan_private * priv, +int libertas_prepare_and_send_command(wlan_private * priv, u16 cmd_no, u16 cmd_action, u16 wait_option, u32 cmd_oid, void *pdata_buf); -void QueueCmd(wlan_adapter * Adapter, struct CmdCtrlNode *CmdNode, u8 addtail); +void libertas_queue_cmd(wlan_adapter * Adapter, struct CmdCtrlNode *CmdNode, u8 addtail); -int SetDeepSleep(wlan_private * priv, u8 bDeepSleep); -int AllocateCmdBuffer(wlan_private * priv); -int ExecuteNextCommand(wlan_private * priv); -int wlan_process_event(wlan_private * priv); -void wlan_interrupt(struct net_device *); -int SetRadioControl(wlan_private * priv); -u32 index_to_data_rate(u8 index); -u8 data_rate_to_index(u32 rate); -void HexDump(char *prompt, u8 * data, int len); -void get_version(wlan_adapter * adapter, char *version, int maxlen); -void wlan_read_write_rfreg(wlan_private * priv); +int libertas_allocate_cmd_buffer(wlan_private * priv); +int libertas_execute_next_command(wlan_private * priv); +int libertas_process_event(wlan_private * priv); +void libertas_interrupt(struct net_device *); +int libertas_set_radio_control(wlan_private * priv); +u32 libertas_index_to_data_rate(u8 index); +u8 libertas_data_rate_to_index(u32 rate); +void libertas_get_version(wlan_adapter * adapter, char *version, int maxlen); /** The proc fs interface */ -void wlan_proc_entry(wlan_private * priv, struct net_device *dev); -void wlan_proc_remove(wlan_private * priv); -void wlan_debug_entry(wlan_private * priv, struct net_device *dev); -void wlan_debug_remove(wlan_private * priv); -int wlan_process_rx_command(wlan_private * priv); -int wlan_process_tx(wlan_private * priv, struct sk_buff *skb); -void CleanupAndInsertCmd(wlan_private * priv, struct CmdCtrlNode *pTempCmd); +void libertas_proc_entry(wlan_private * priv, struct net_device *dev); +void libertas_proc_remove(wlan_private * priv); +void libertas_debug_entry(wlan_private * priv, struct net_device *dev); +void libertas_debug_remove(wlan_private * priv); +int libertas_process_rx_command(wlan_private * priv); +int libertas_process_tx(wlan_private * priv, struct sk_buff *skb); +void libertas_cleanup_and_insert_cmd(wlan_private * priv, + struct CmdCtrlNode *pTempCmd); #ifdef REASSOCIATION -void reassoc_timer_fn(unsigned long data); +void libertas_reassoc_timer_fn(unsigned long data); #endif /* REASSOCIATION */ struct iw_point; struct iw_request_info; -int wlan_set_essid(struct net_device *dev, struct iw_request_info *info, +int libertas_set_essid(struct net_device *dev, struct iw_request_info *info, struct iw_point *dwrq, char *extra); -int wlan_set_regiontable(wlan_private * priv, u8 region, u8 band); +int libertas_set_regiontable(wlan_private * priv, u8 region, u8 band); -int ProcessRxedPacket(wlan_private * priv, struct sk_buff *); +int libertas_process_rxed_packet(wlan_private * priv, struct sk_buff *); -void PSSleep(wlan_private * priv, int wait_option); -void PSConfirmSleep(wlan_private * priv, u16 PSMode); -void PSWakeup(wlan_private * priv, int wait_option); +void libertas_ps_sleep(wlan_private * priv, int wait_option); +void libertas_ps_confirm_sleep(wlan_private * priv, u16 PSMode); +void libertas_ps_wakeup(wlan_private * priv, int wait_option); -void wlan_tx_runqueue(wlan_private *priv); +void libertas_tx_runqueue(wlan_private *priv); #define SDIO_HEADER_LEN 4 -void wlan_send_rxskbQ(wlan_private * priv); - -extern struct chan_freq_power *libertas_find_cfp_by_band_and_channel(wlan_adapter * adapter, - u8 band, u16 channel); +extern struct chan_freq_power *libertas_find_cfp_by_band_and_channel( + wlan_adapter * adapter, u8 band, u16 channel); extern void libertas_mac_event_disconnected(wlan_private * priv); -void send_iwevcustom_event(wlan_private * priv, s8 * str); +void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str); #endif /* _WLAN_DECL_H_ */ Index: linus-2.6/drivers/net/wireless/libertas/wlan_dev.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_dev.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_dev.h @@ -319,7 +319,7 @@ struct _wlan_adapter { u32 PSState; u8 NeedToWakeup; - struct PS_CMD_ConfirmSleep PSConfirmSleep; + struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep; u16 LocalListenInterval; u16 NullPktInterval; Index: linus-2.6/drivers/net/wireless/libertas/wlan_join.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_join.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_join.c @@ -178,7 +178,7 @@ int libertas_do_adhocstop_ioctl(wlan_pri * @param extra A pointer to extra data buf * @return WLAN_STATUS_SUCCESS--success, otherwise--fail */ -int wlan_set_essid(struct net_device *dev, struct iw_request_info *info, +int libertas_set_essid(struct net_device *dev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { wlan_private *priv = dev->priv; @@ -194,7 +194,7 @@ int wlan_set_essid(struct net_device *de del_timer(&Adapter->reassoc_timer); if (down_interruptible(&Adapter->ReassocSem)) { - PRINTM(FATAL, "Acquire semaphore error, wlan_set_essid\n"); + PRINTM(FATAL, "Acquire semaphore error, libertas_set_essid\n"); return -EBUSY; } #endif /* REASSOCIATION */ @@ -433,7 +433,7 @@ static int wlan_associate(wlan_private * { int ret; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_AUTHENTICATE, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_AUTHENTICATE, 0, HostCmd_OPTION_WAITFORRSP, 0, pBSSDesc->MacAddress); @@ -442,7 +442,7 @@ static int wlan_associate(wlan_private * return ret; } - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_ASSOCIATE, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_ASSOCIATE, 0, HostCmd_OPTION_WAITFORRSP, 0, pBSSDesc); LEAVE(); @@ -473,14 +473,14 @@ int libertas_start_adhoc_network(wlan_pr Adapter->Preamble = HostCmd_TYPE_SHORT_PREAMBLE; } - SetRadioControl(priv); + libertas_set_radio_control(priv); PRINTM(INFO, "Adhoc Channel = %d\n", Adapter->AdhocChannel); PRINTM(INFO, "CurBssParams.channel = %d\n", Adapter->CurBssParams.channel); PRINTM(INFO, "CurBssParams.band = %d\n", Adapter->CurBssParams.band); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_AD_HOC_START, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_AD_HOC_START, 0, HostCmd_OPTION_WAITFORRSP, 0, AdhocSSID); LEAVE(); @@ -534,7 +534,7 @@ int libertas_join_adhoc_network(wlan_pri Adapter->Preamble = HostCmd_TYPE_SHORT_PREAMBLE; } - SetRadioControl(priv); + libertas_set_radio_control(priv); PRINTM(INFO, "CurBssParams.channel = %d\n", Adapter->CurBssParams.channel); @@ -548,7 +548,7 @@ int libertas_join_adhoc_network(wlan_pri memcpy(&Adapter->AttemptedSSIDBeforeScan, &pBSSDesc->Ssid, sizeof(struct WLAN_802_11_SSID)); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_AD_HOC_JOIN, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_AD_HOC_JOIN, 0, HostCmd_OPTION_WAITFORRSP, OID_802_11_SSID, pBSSDesc); @@ -564,7 +564,7 @@ int libertas_join_adhoc_network(wlan_pri */ int libertas_stop_adhoc_network(wlan_private * priv) { - return PrepareAndSendCommand(priv, HostCmd_CMD_802_11_AD_HOC_STOP, + return libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_AD_HOC_STOP, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); } @@ -576,7 +576,7 @@ int libertas_stop_adhoc_network(wlan_pri */ int libertas_send_deauthentication(wlan_private * priv) { - return PrepareAndSendCommand(priv, HostCmd_CMD_802_11_DEAUTHENTICATE, + return libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_DEAUTHENTICATE, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); } @@ -659,7 +659,7 @@ int libertas_idle_off(wlan_private * pri } } } else if (Adapter->InfrastructureMode == Wlan802_11IBSS) { - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_AD_HOC_START, 0, HostCmd_OPTION_WAITFORRSP, @@ -825,7 +825,7 @@ int libertas_cmd_80211_associate(wlan_pr Adapter->Preamble = HostCmd_TYPE_LONG_PREAMBLE; } - SetRadioControl(priv); + libertas_set_radio_control(priv); /* set the listen interval */ pAsso->ListenInterval = Adapter->ListenInterval; @@ -905,7 +905,7 @@ int libertas_cmd_80211_associate(wlan_pr pAsso->CapInfo.Ess = CAPINFO_ESS_MODE; } - if (wlan_parse_dnld_countryinfo_11d(priv)) { + if (libertas_parse_dnld_countryinfo_11d(priv)) { ret = WLAN_STATUS_FAILURE; goto done; } @@ -1066,7 +1066,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan PRINTM(INFO, "ADHOC_S_CMD: AD HOC Start command is ready\n"); - if (wlan_create_dnld_countryinfo_11d(priv)) { + if (libertas_create_dnld_countryinfo_11d(priv)) { PRINTM(INFO, "ADHOC_S_CMD: dnld_countryinfo_11d failed\n"); ret = WLAN_STATUS_FAILURE; goto done; @@ -1223,7 +1223,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_ enum WLAN_802_11_POWER_MODE LocalPSMode; LocalPSMode = Wlan802_11PowerModeCAM; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_PS_MODE, HostCmd_ACT_GEN_SET, 0, 0, &LocalPSMode); @@ -1234,7 +1234,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_ } } - if (wlan_parse_dnld_countryinfo_11d(priv)) { + if (libertas_parse_dnld_countryinfo_11d(priv)) { ret = WLAN_STATUS_FAILURE; goto done; } @@ -1541,7 +1541,7 @@ int libertas_reassociation_thread(void * } /* The semaphore is used to avoid reassociation thread and - libertas_set_scan/wlan_set_essid interrupting each other. + libertas_set_scan/libertas_set_essid interrupting each other. Reassociation should be disabled completely by application if libertas_set_user_scan_ioctl/libertas_set_wap is used. */ Index: linus-2.6/drivers/net/wireless/libertas/wlan_main.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_main.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_main.c @@ -219,7 +219,7 @@ u16 libertas_region_code_to_index[MRVDRV { 0x10, 0x20, 0x30, 0x31, 0x32, 0x40 }; static u8 *default_fw_name = "usb8388.bin"; -extern u8 *fw_name; +extern u8 *libertas_fw_name; /** * @brief This function opens the network device @@ -325,7 +325,7 @@ static int wlan_pm_callback(struct pm_de PRINTM(INFO, "netif_device_detach().\n"); } - sbi_suspend(priv); + libertas_sbi_suspend(priv); } break; } @@ -345,7 +345,7 @@ static int wlan_pm_callback(struct pm_de * this makes driver independent of the card */ - sbi_suspend(priv); + libertas_sbi_suspend(priv); break; @@ -357,7 +357,7 @@ static int wlan_pm_callback(struct pm_de * Bring the inteface up first * This case should not happen still ... */ - sbi_resume(priv); + libertas_sbi_resume(priv); /* * Attach the network interface @@ -381,7 +381,7 @@ static int wlan_pm_callback(struct pm_de * This case should not happen still ... */ - sbi_resume(priv); + libertas_sbi_resume(priv); if (netif_running(dev)) netif_device_attach(dev); @@ -415,7 +415,7 @@ static int wlan_hard_start_xmit(struct s netif_stop_queue(priv->wlan_dev.netdev); - if (wlan_process_tx(priv, skb) == 0) + if (libertas_process_tx(priv, skb) == 0) dev->trans_start = jiffies; done: LEAVE(); @@ -445,7 +445,7 @@ static void wlan_tx_timeout(struct net_d /* If we are here, we have not received feedback from the previous packet. Assume TX_FAIL and move on. */ priv->adapter->EventCause = 0x01000000; - SendTxFeedback(priv); + libertas_send_tx_feedback(priv); } else wake_up_interruptible(&priv->MainThread.waitQ); } else if (priv->adapter->MediaConnectStatus == WlanMediaStateConnected) @@ -491,7 +491,7 @@ static int wlan_set_mac_address(struct n HEXDUMP("addr:", pHwAddr->sa_data, ETH_ALEN); memcpy(Adapter->CurrentAddr, pHwAddr->sa_data, ETH_ALEN); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_MAC_ADDRESS, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_MAC_ADDRESS, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -576,7 +576,7 @@ static void wlan_set_multicast_list(stru Adapter->MulticastList[i][5]); } /* set multicast addresses to firmware */ - PrepareAndSendCommand(priv, + libertas_prepare_and_send_command(priv, HostCmd_CMD_MAC_MULTICAST_ADR, HostCmd_ACT_GEN_SET, 0, 0, NULL); @@ -585,7 +585,7 @@ static void wlan_set_multicast_list(stru } if (Adapter->CurrentPacketFilter != OldPacketFilter) { - SetMacPacketFilter(priv); + libertas_set_mac_packet_filter(priv); } LEAVE(); @@ -664,7 +664,7 @@ static int wlan_service_main_thread(void Adapter->IntCounter = 0; spin_unlock_irqrestore(&libertas_driver_lock, flags); - if (sbi_get_int_status(priv, &ireg)) { + if (libertas_sbi_get_int_status(priv, &ireg)) { PRINTM(INFO, "main-thread: reading HOST_INT_STATUS_REG failed\n"); continue; @@ -687,7 +687,7 @@ static int wlan_service_main_thread(void Adapter->HisRegCpy &= ~HIS_CmdUpLdRdy; spin_unlock_irqrestore(&libertas_driver_lock, flags); - wlan_process_rx_command(priv); + libertas_process_rx_command(priv); } /* Any Card Event */ @@ -698,12 +698,12 @@ static int wlan_service_main_thread(void Adapter->HisRegCpy &= ~HIS_CardEvent; spin_unlock_irqrestore(&libertas_driver_lock, flags); - if (sbi_read_event_cause(priv)) { + if (libertas_sbi_read_event_cause(priv)) { PRINTM(MSG, - "main-thread: sbi_read_event_cause failed.\n"); + "main-thread: libertas_sbi_read_event_cause failed.\n"); continue; } - wlan_process_event(priv); + libertas_process_event(priv); } /* Check if we need to confirm Sleep Request received previously */ @@ -719,7 +719,7 @@ static int wlan_service_main_thread(void priv->wlan_dev.dnld_sent, Adapter->CurCmd); - PSConfirmSleep(priv, + libertas_ps_confirm_sleep(priv, (u16) Adapter->PSMode); } else { /* workaround for firmware sending deauth/linkloss event @@ -741,10 +741,10 @@ static int wlan_service_main_thread(void /* Execute the next command */ if (!priv->wlan_dev.dnld_sent && !Adapter->CurCmd) { - ExecuteNextCommand(priv); + libertas_execute_next_command(priv); } - wlan_tx_runqueue(priv); + libertas_tx_runqueue(priv); } @@ -769,7 +769,7 @@ static wlan_private *wlan_add_card(void ENTER(); /* probe the card */ - if (sbi_probe_card(card) < 0) { + if (libertas_sbi_probe_card(card) < 0) { PRINTM(MSG, "NO card found!\n"); return NULL; } @@ -801,7 +801,7 @@ static wlan_private *wlan_add_card(void dev->open = wlan_open; dev->hard_start_xmit = wlan_hard_start_xmit; dev->stop = wlan_close; - dev->do_ioctl = wlan_do_ioctl; + dev->do_ioctl = libertas_do_ioctl; dev->set_mac_address = wlan_set_mac_address; #define WLAN_WATCHDOG_TIMEOUT (5 * HZ) @@ -845,7 +845,7 @@ static wlan_private *wlan_add_card(void * IRQ. */ - if (sbi_register_dev(priv) < 0) { + if (libertas_sbi_register_dev(priv) < 0) { PRINTM(FATAL, "Failed to register wlan device!\n"); goto err_registerdev; } @@ -854,16 +854,16 @@ static wlan_private *wlan_add_card(void "revision 0x%02X at IRQ %i\n", dev->name, priv->adapter->chip_rev, dev->irq); - wlan_proc_entry(priv, dev); + libertas_proc_entry(priv, dev); #ifdef PROC_DEBUG - wlan_debug_entry(priv, dev); + libertas_debug_entry(priv, dev); #endif /* Get the CIS Table */ - sbi_get_cis_info(priv); + libertas_sbi_get_cis_info(priv); /* init FW and HW */ - if (wlan_init_fw(priv)) { + if (libertas_init_fw(priv)) { PRINTM(INFO, "Firmware Init Failed\n"); goto err_init_fw; } @@ -877,7 +877,7 @@ static wlan_private *wlan_add_card(void return priv; err_init_fw: - sbi_unregister_dev(priv); + libertas_sbi_unregister_dev(priv); err_registerdev: /* Stop the thread servicing the interrupts */ @@ -937,7 +937,7 @@ static int wlan_remove_card(void *card) if (Adapter->PSMode == Wlan802_11PowerModeMAX_PSP) { Adapter->PSMode = Wlan802_11PowerModeCAM; - PSWakeup(priv, HostCmd_OPTION_WAITFORRSP); + libertas_ps_wakeup(priv, HostCmd_OPTION_WAITFORRSP); } memset(wrqu.ap_addr.sa_data, 0xaa, ETH_ALEN); @@ -945,9 +945,9 @@ static int wlan_remove_card(void *card) wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL); /* Disable interrupts on the card as we cannot handle them after RESET */ - sbi_disable_host_int(priv); + libertas_sbi_disable_host_int(priv); - PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RESET, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RESET, HostCmd_ACT_HALT, 0, 0, NULL); msleep_interruptible(200); @@ -969,15 +969,15 @@ static int wlan_remove_card(void *card) #endif /* REASSOCIATION */ #ifdef PROC_DEBUG - wlan_debug_remove(priv); + libertas_debug_remove(priv); #endif - wlan_proc_remove(priv); + libertas_proc_remove(priv); PRINTM(INFO, "unregester dev\n"); - sbi_unregister_dev(priv); + libertas_sbi_unregister_dev(priv); PRINTM(INFO, "Free Adapter\n"); - wlan_free_adapter(priv); + libertas_free_adapter(priv); /* Last reference is our one */ PRINTM(INFO, "refcnt = %d\n", atomic_read(&dev->refcnt)); @@ -1008,7 +1008,7 @@ static int wlan_remove_card(void *card) * @param cfp_no A pointer to CFP number * @return A pointer to CFP */ -struct chan_freq_power *wlan_get_region_cfp_table(u8 region, u8 band, int *cfp_no) +struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *cfp_no) { int i, end; @@ -1038,7 +1038,7 @@ struct chan_freq_power *wlan_get_region_ * @param band The band * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_set_regiontable(wlan_private * priv, u8 region, u8 band) +int libertas_set_regiontable(wlan_private * priv, u8 region, u8 band) { wlan_adapter *Adapter = priv->adapter; int i = 0; @@ -1051,7 +1051,7 @@ int wlan_set_regiontable(wlan_private * memset(Adapter->region_channel, 0, sizeof(Adapter->region_channel)); { - cfp = wlan_get_region_cfp_table(region, band, &cfp_no); + cfp = libertas_get_region_cfp_table(region, band, &cfp_no); if (cfp != NULL) { Adapter->region_channel[i].NrCFP = cfp_no; Adapter->region_channel[i].CFP = cfp; @@ -1077,13 +1077,13 @@ int wlan_set_regiontable(wlan_private * * @param dev A pointer to net_device structure * @return n/a */ -void wlan_interrupt(struct net_device *dev) +void libertas_interrupt(struct net_device *dev) { wlan_private *priv = dev->priv; ENTER(); - PRINTM(INFO, "wlan_interrupt: IntCounter=%d\n", + PRINTM(INFO, "libertas_interrupt: IntCounter=%d\n", priv->adapter->IntCounter); priv->adapter->IntCounter++; @@ -1110,11 +1110,11 @@ static int wlan_init_module(void) ENTER(); - if (fw_name == NULL) { - fw_name = default_fw_name; + if (libertas_fw_name == NULL) { + libertas_fw_name = default_fw_name; } - if (sbi_register(wlan_add_card, wlan_remove_card, NULL) == NULL) { + if (libertas_sbi_register(wlan_add_card, wlan_remove_card, NULL) == NULL) { ret = WLAN_STATUS_FAILURE; goto done; } @@ -1134,7 +1134,7 @@ static void wlan_cleanup_module(void) { ENTER(); - sbi_unregister(); + libertas_sbi_unregister(); LEAVE(); } Index: linus-2.6/drivers/net/wireless/libertas/wlan_proc.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_proc.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_proc.c @@ -71,7 +71,7 @@ static int wlan_proc_read(char *page, ch goto exit; } - get_version(priv->adapter, fmt, sizeof(fmt) - 1); + libertas_get_version(priv->adapter, fmt, sizeof(fmt) - 1); p += sprintf(p, "driver_name = " "\"wlan\"\n"); p += sprintf(p, "libertas_driver_version = %s", fmt); @@ -132,7 +132,7 @@ static int wlan_proc_read(char *page, ch * @param dev pointer net_device * @return N/A */ -void wlan_proc_entry(wlan_private * priv, struct net_device *dev) +void libertas_proc_entry(wlan_private * priv, struct net_device *dev) { #ifdef CONFIG_PROC_FS @@ -155,7 +155,7 @@ void wlan_proc_entry(wlan_private * priv * @param priv pointer wlan_private * @return N/A */ -void wlan_proc_remove(wlan_private * priv) +void libertas_proc_remove(wlan_private * priv) { #ifdef CONFIG_PROC_FS if (priv->proc_entry) Index: linus-2.6/drivers/net/wireless/libertas/wlan_scan.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_scan.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_scan.c @@ -361,7 +361,7 @@ static void wlan_scan_create_channel_lis scanType = Adapter->ScanType; for (rgnIdx = 0; rgnIdx < NELEMENTS(Adapter->region_channel); rgnIdx++) { - if (wlan_get_state_11d(priv) == ENABLE_11D && + if (libertas_get_state_11d(priv) == ENABLE_11D && Adapter->MediaConnectStatus != WlanMediaStateConnected) { /* Scan all the supported chan for the first scan */ if (!Adapter->universal_channel[rgnIdx].Valid) @@ -382,9 +382,9 @@ static void wlan_scan_create_channel_lis cfp = scanRegion->CFP + nextChan; - if (wlan_get_state_11d(priv) == ENABLE_11D) { + if (libertas_get_state_11d(priv) == ENABLE_11D) { scanType = - wlan_get_scan_type_11d(cfp->Channel, + libertas_get_scan_type_11d(cfp->Channel, &Adapter-> parsed_region_chan); } @@ -771,7 +771,7 @@ static int wlan_scan_channel_list(wlan_p } /* Send the scan command to the firmware with the specified cfg */ - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_SCAN, 0, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SCAN, 0, HostCmd_OPTION_WAITFORRSP, 0, pScanCfgOut); } @@ -1493,7 +1493,7 @@ int libertas_find_best_network_SSID(wlan Adapter->InfrastructureMode = pReqBSSID->InfrastructureMode; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, @@ -1759,7 +1759,7 @@ int libertas_get_scan(struct net_device !libertas_SSID_cmp(&Adapter->CurBssParams.ssid, &Adapter->ScanTable[i].Ssid) && Adapter->AdhocCreate) { - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RSSI, 0, HostCmd_OPTION_WAITFORRSP, @@ -2076,7 +2076,7 @@ int libertas_set_user_scan_ioctl(wlan_pr * @brief Prepare a scan command to be sent to the firmware * * Use the wlan_scan_cmd_config sent to the command processing module in - * the PrepareAndSendCommand to configure a HostCmd_DS_802_11_SCAN command + * the libertas_prepare_and_send_command to configure a HostCmd_DS_802_11_SCAN command * struct to send to firmware. * * The fixed fields specifying the BSS type and BSSID filters as well as a Index: linus-2.6/drivers/net/wireless/libertas/wlan_wext.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_wext.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_wext.c @@ -267,7 +267,7 @@ static int UpdateCurrentChannel(wlan_pri /* ** the channel in f/w could be out of sync, get the current channel */ - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RF_CHANNEL, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_CHANNEL, HostCmd_OPT_802_11_RF_CHANNEL_GET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -291,7 +291,7 @@ static int SetCurrentChannel(wlan_privat /* ** Current channel is not set to AdhocChannel requested, set channel */ - return (PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RF_CHANNEL, + return (libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_CHANNEL, HostCmd_OPT_802_11_RF_CHANNEL_SET, HostCmd_OPTION_WAITFORRSP, 0, &channel)); } @@ -407,7 +407,7 @@ static int wlan_set_encode_wpa(struct ne return WLAN_STATUS_FAILURE; } - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_KEY_MATERIAL, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, @@ -429,7 +429,7 @@ static int wlan_set_encode_wpa(struct ne * iwconfig ethX key kstr: WepKey[CurrentWepKeyIndex] = kstr; * * all: Send command SET_WEP; - SetMacPacketFilter; + libertas_set_mac_packet_filter; */ /** @@ -576,7 +576,7 @@ static int wlan_set_encode_nonwpa(struct } if (pWep->KeyLength) { - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SET_WEP, 0, HostCmd_OPTION_WAITFORRSP, OID_802_11_ADD_WEP, NULL); @@ -593,7 +593,7 @@ static int wlan_set_encode_nonwpa(struct Adapter->CurrentPacketFilter &= ~HostCmd_ACT_MAC_WEP_ENABLE; } - SetMacPacketFilter(priv); + libertas_set_mac_packet_filter(priv); if (dwrq->flags & IW_ENCODE_RESTRICTED) { /* iwconfig ethX restricted key [1] */ @@ -659,7 +659,7 @@ static int SetRxAntenna(wlan_private * p PRINTM(INFO, "SET RX Antenna Mode to 0x%04x\n", Adapter->RxAntennaMode); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RF_ANTENNA, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_ANTENNA, HostCmd_ACT_SET_RX, HostCmd_OPTION_WAITFORRSP, 0, &Adapter->RxAntennaMode); @@ -687,7 +687,7 @@ static int SetTxAntenna(wlan_private * p PRINTM(INFO, "SET TX Antenna Mode to 0x%04x\n", Adapter->TxAntennaMode); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RF_ANTENNA, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_ANTENNA, HostCmd_ACT_SET_TX, HostCmd_OPTION_WAITFORRSP, 0, &Adapter->TxAntennaMode); @@ -713,7 +713,7 @@ static int GetRxAntenna(wlan_private * p // returned below is correct or not. Adapter->RxAntennaMode = 0; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RF_ANTENNA, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_ANTENNA, HostCmd_ACT_GET_RX, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -747,7 +747,7 @@ static int GetTxAntenna(wlan_private * p // returned below is correct or not. Adapter->TxAntennaMode = 0; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_RF_ANTENNA, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_ANTENNA, HostCmd_ACT_GET_TX, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -781,7 +781,7 @@ static int wlan_radio_ioctl(wlan_private PRINTM(INFO, "Switching %s the Radio\n", option ? "On" : "Off"); Adapter->RadioOn = option; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RADIO_CONTROL, HostCmd_ACT_GEN_SET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -860,7 +860,7 @@ static int wlan_set_region(wlan_private return WLAN_STATUS_FAILURE; } - if (wlan_set_regiontable(priv, priv->adapter->RegionCode, 0)) { + if (libertas_set_regiontable(priv, priv->adapter->RegionCode, 0)) { LEAVE(); return -EINVAL; } @@ -1224,7 +1224,7 @@ static int wlan_set_rts(struct net_devic Adapter->RTSThsd = rthr; } - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_SNMP_MIB, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, OID_802_11_RTS_THRESHOLD, &rthr); @@ -1251,7 +1251,7 @@ static int wlan_get_rts(struct net_devic ENTER(); Adapter->RTSThsd = 0; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_SNMP_MIB, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_GET, HostCmd_OPTION_WAITFORRSP, OID_802_11_RTS_THRESHOLD, NULL); if (ret) { @@ -1296,7 +1296,7 @@ static int wlan_set_frag(struct net_devi Adapter->FragThsd = fthr; } - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_SNMP_MIB, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, OID_802_11_FRAGMENTATION_THRESHOLD, &fthr); LEAVE(); @@ -1322,7 +1322,7 @@ static int wlan_get_frag(struct net_devi ENTER(); Adapter->FragThsd = 0; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_GET, HostCmd_OPTION_WAITFORRSP, OID_802_11_FRAGMENTATION_THRESHOLD, NULL); @@ -1508,7 +1508,7 @@ static int wlan_get_txpow(struct net_dev ENTER(); - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_TX_POWER, HostCmd_ACT_TX_POWER_OPT_GET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -1561,7 +1561,7 @@ static int wlan_set_retry(struct net_dev /* Adding 1 to convert retry count to try count */ adapter->TxRetryCount = vwrq->value + 1; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_SNMP_MIB, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, OID_802_11_TX_RETRYCOUNT, NULL); @@ -1596,7 +1596,7 @@ static int wlan_get_retry(struct net_dev ENTER(); Adapter->TxRetryCount = 0; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_GET, HostCmd_OPTION_WAITFORRSP, OID_802_11_TX_RETRYCOUNT, NULL); @@ -1693,7 +1693,7 @@ static int wlan_get_range(struct net_dev range->num_bitrates); range->num_frequency = 0; - if (wlan_get_state_11d(priv) == ENABLE_11D && + if (libertas_get_state_11d(priv) == ENABLE_11D && Adapter->MediaConnectStatus == WlanMediaStateConnected) { u8 chan_no; u8 band; @@ -1716,7 +1716,7 @@ static int wlan_get_range(struct net_dev PRINTM(INFO, "chan_no=%d\n", chan_no); range->freq[range->num_frequency].i = (long)chan_no; range->freq[range->num_frequency].m = - (long)chan_2_freq(chan_no, band) * 100000; + (long)libertas_chan_2_freq(chan_no, band) * 100000; range->freq[range->num_frequency].e = 1; range->num_frequency++; } @@ -1853,7 +1853,7 @@ static int wlan_set_power(struct net_dev if (vwrq->disabled) { Adapter->PSMode = Wlan802_11PowerModeCAM; if (Adapter->PSState != PS_STATE_FULL_POWER) { - PSWakeup(priv, HostCmd_OPTION_WAITFORRSP); + libertas_ps_wakeup(priv, HostCmd_OPTION_WAITFORRSP); } return 0; @@ -1875,7 +1875,7 @@ static int wlan_set_power(struct net_dev Adapter->PSMode = Wlan802_11PowerModeMAX_PSP; if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { - PSSleep(priv, HostCmd_OPTION_WAITFORRSP); + libertas_ps_sleep(priv, HostCmd_OPTION_WAITFORRSP); } LEAVE(); @@ -1980,7 +1980,7 @@ static const iw_handler wlan_handler[] = NULL, /* SIOCGIWAPLIST */ (iw_handler) libertas_set_scan, /* SIOCSIWSCAN */ (iw_handler) libertas_get_scan, /* SIOCGIWSCAN */ - (iw_handler) wlan_set_essid, /* SIOCSIWESSID */ + (iw_handler) libertas_set_essid, /* SIOCSIWESSID */ (iw_handler) wlan_get_essid, /* SIOCGIWESSID */ (iw_handler) wlan_set_nick, /* SIOCSIWNICKN */ (iw_handler) wlan_get_nick, /* SIOCGIWNICKN */ @@ -2500,8 +2500,8 @@ static int wlan_hostcmd_ioctl(struct net /* * Get a free command control node */ - if (!(pCmdNode = GetFreeCmdCtrlNode(priv))) { - PRINTM(INFO, "Failed GetFreeCmdCtrlNode\n"); + if (!(pCmdNode = libertas_get_free_cmd_ctrl_node(priv))) { + PRINTM(INFO, "Failed libertas_get_free_cmd_ctrl_node\n"); return -ENOMEM; } @@ -2512,7 +2512,7 @@ static int wlan_hostcmd_ioctl(struct net wait_option |= HostCmd_OPTION_WAITFORRSP; - SetCmdCtrlNode(priv, pCmdNode, 0, wait_option, NULL); + libertas_set_cmd_ctrl_node(priv, pCmdNode, 0, wait_option, NULL); init_waitqueue_head(&pCmdNode->cmdwait_q); pCmdPtr = (struct HostCmd_DS_GEN *)pCmdNode->BufVirtualAddr; @@ -2541,7 +2541,7 @@ static int wlan_hostcmd_ioctl(struct net req->ifr_data, pCmdPtr); pCmdNode->CmdWaitQWoken = 0; - QueueCmd(Adapter, pCmdNode, 1); + libertas_queue_cmd(Adapter, pCmdNode, 1); wake_up_interruptible(&priv->MainThread.waitQ); if (wait_option & HostCmd_OPTION_WAITFORRSP) { @@ -2610,7 +2610,7 @@ static int wlan_get_snr(wlan_private * p } if ((wrq->u.data.length == 0) || (data[0] == 0) || (data[0] == 1)) { if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RSSI, 0, HostCmd_OPTION_WAITFORRSP, @@ -2725,7 +2725,7 @@ static int wlan_get_rssi(wlan_private * ENTER(); data = *((int *)(wrq->u.name + SUBCMD_OFFSET)); if ((data == 0) || (data == 1)) { - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RSSI, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -2781,7 +2781,7 @@ static int wlan_get_nf(wlan_private * pr ENTER(); data = *((int *)(wrq->u.name + SUBCMD_OFFSET)); if ((data == 0) || (data == 1)) { - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RSSI, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -2834,7 +2834,7 @@ static int wlan_get_txrate_ioctl(wlan_pr ENTER(); Adapter->TxRate = 0; PRINTM(INFO, "wlan_get_txrate_ioctl\n"); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_TX_RATE_QUERY, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_TX_RATE_QUERY, HostCmd_ACT_GET, HostCmd_OPTION_WAITFORRSP, 0, NULL); if (ret) { @@ -2908,7 +2908,7 @@ static int wlan_version_ioctl(wlan_priva ENTER(); - get_version(priv->adapter, buf, sizeof(buf) - 1); + libertas_get_version(priv->adapter, buf, sizeof(buf) - 1); len = strlen(buf); if (wrq->u.data.pointer) { @@ -2961,7 +2961,7 @@ static int wlan_regrdwr_ioctl(wlan_priva PRINTM(INFO, "Action:%d Offset: %x NOB: %02x\n", regrdwr.Action, regrdwr.Offset, regrdwr.NOB); - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_EEPROM_ACCESS, regrdwr.Action, HostCmd_OPTION_WAITFORRSP, 0, @@ -3013,7 +3013,7 @@ static int wlan_regrdwr_ioctl(wlan_priva * HostCmd_CMD_BBP_REG_ACCESS 0x001a * HostCmd_CMD_RF_REG_ACCESS 0x001b */ - ret = PrepareAndSendCommand(priv, regrdwr.WhichReg, + ret = libertas_prepare_and_send_command(priv, regrdwr.WhichReg, regrdwr.Action, HostCmd_OPTION_WAITFORRSP, 0, &offval); @@ -3088,7 +3088,7 @@ static int wlan_setwpaie_ioctl(wlan_priv // enable/disable RSN in firmware if WPA is enabled/disabled // depending on variable Adapter->SecInfo.WPAEnabled is set or not - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_ENABLE_RSN, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_ENABLE_RSN, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -3441,7 +3441,7 @@ static int wlan_get_tsf_ioctl(wlan_priva ENTER(); - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_GET_TSF, 0, HostCmd_OPTION_WAITFORRSP, 0, &tsfVal); @@ -3505,7 +3505,7 @@ static int wlan_sleep_period(wlan_privat return -EINVAL; } - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_SLEEP_PERIOD, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SLEEP_PERIOD, 0, HostCmd_OPTION_WAITFORRSP, 0, (void *)&sleeppd); @@ -3536,7 +3536,7 @@ static int wlan_adapt_rateset(wlan_priva memset(data, 0, sizeof(data)); if (!wrq->u.data.length) { PRINTM(INFO, "Get ADAPT RATE SET\n"); - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RATE_ADAPT_RATESET, HostCmd_ACT_GEN_GET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -3561,7 +3561,7 @@ static int wlan_adapt_rateset(wlan_priva Adapter->EnableHwAuto = data[0]; Adapter->RateBitmap = data[1]; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RATE_ADAPT_RATESET, HostCmd_ACT_GEN_SET, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -3589,7 +3589,7 @@ static int wlan_inactivity_timeout(wlan_ if (wrq->u.data.length == 0) { /* Get */ - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_INACTIVITY_TIMEOUT, HostCmd_ACT_GET, HostCmd_OPTION_WAITFORRSP, 0, @@ -3607,7 +3607,7 @@ static int wlan_inactivity_timeout(wlan_ } timeout = data; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_INACTIVITY_TIMEOUT, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, 0, @@ -3636,7 +3636,7 @@ static int wlan_do_getlog_ioctl(wlan_pri PRINTM(INFO, " GET STATS\n"); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_GET_LOG, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_GET_LOG, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); if (ret) { @@ -3698,7 +3698,7 @@ static int wlan_sleep_params_ioctl(wlan_ memcpy(&Adapter->sp, &sp.Error, sizeof(struct sleep_params)); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_SLEEP_PARAMS, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SLEEP_PARAMS, sp.Action, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -3759,7 +3759,7 @@ static int wlan_scan_type_ioctl(wlan_pri ENTER(); - if (wlan_get_state_11d(priv) == ENABLE_11D) { + if (libertas_get_state_11d(priv) == ENABLE_11D) { PRINTM(INFO, "11D: Cannot set scantype when 11D enabled\n"); return -EFAULT; } @@ -3927,7 +3927,7 @@ static int wlan_do_set_grate_ioctl(wlan_ * @param cmd command * @return WLAN_STATUS_SUCCESS--success, otherwise fail */ -int wlan_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) +int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { int subcmd = 0; int idata = 0; @@ -3939,7 +3939,7 @@ int wlan_do_ioctl(struct net_device *dev ENTER(); - PRINTM(INFO, "wlan_do_ioctl: ioctl cmd = 0x%x\n", cmd); + PRINTM(INFO, "libertas_do_ioctl: ioctl cmd = 0x%x\n", cmd); switch (cmd) { case WLANEXTSCAN: ret = libertas_extscan_ioctl(priv, req); @@ -4035,7 +4035,7 @@ int wlan_do_ioctl(struct net_device *dev ret = wlan_get_rssi(priv, wrq); break; case WLANENABLE11D: - ret = wlan_cmd_enable_11d(priv, wrq); + ret = libertas_cmd_enable_11d(priv, wrq); break; case WLANADHOCGRATE: ret = wlan_do_set_grate_ioctl(priv, wrq); @@ -4343,7 +4343,7 @@ int wlan_do_ioctl(struct net_device *dev } ret = - PrepareAndSendCommand(priv, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_TPC_CFG, 0, HostCmd_OPTION_WAITFORRSP, @@ -4395,7 +4395,7 @@ int wlan_do_ioctl(struct net_device *dev cfg.PA_P2 = data[3]; } ret = - PrepareAndSendCommand(priv, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_PWR_CFG, 0, HostCmd_OPTION_WAITFORRSP, @@ -4437,7 +4437,7 @@ int wlan_do_ioctl(struct net_device *dev afc.afc_foff = data[2]; } ret = - PrepareAndSendCommand(priv, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SET_AFC, 0, HostCmd_OPTION_WAITFORRSP, @@ -4450,7 +4450,7 @@ int wlan_do_ioctl(struct net_device *dev struct HostCmd_DS_802_11_AFC afc; memset(&afc, 0, sizeof(afc)); ret = - PrepareAndSendCommand(priv, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_GET_AFC, 0, HostCmd_OPTION_WAITFORRSP, @@ -4538,7 +4538,7 @@ int wlan_do_ioctl(struct net_device *dev } } ret = - PrepareAndSendCommand(priv, + libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_LED_GPIO_CTRL, 0, HostCmd_OPTION_WAITFORRSP, @@ -4629,7 +4629,7 @@ static struct iw_statistics *wlan_get_wi goto out; /* send RSSI command to get beacon RSSI/NF, valid only if associated */ - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RSSI, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); if (ret) @@ -4667,7 +4667,7 @@ static struct iw_statistics *wlan_get_wi /* Quality by TX errors */ priv->wstats.discard.retries = priv->stats.tx_errors; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_GET_LOG, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_GET_LOG, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); if (!ret) { u32 tx_retries = Adapter->LogMsg.retry; @@ -4778,7 +4778,7 @@ int wlan_set_freq(struct net_device *dev if (Adapter->SecInfo.WEPStatus == Wlan802_11WEPEnabled) { PRINTM(INFO, "set_freq: WEP Enabled\n"); - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SET_WEP, 0, HostCmd_OPTION_WAITFORRSP, @@ -4793,7 +4793,7 @@ int wlan_set_freq(struct net_device *dev Adapter->CurrentPacketFilter |= HostCmd_ACT_MAC_WEP_ENABLE; - SetMacPacketFilter(priv); + libertas_set_mac_packet_filter(priv); } } else { rc = -EOPNOTSUPP; @@ -4811,7 +4811,7 @@ int wlan_set_freq(struct net_device *dev * @param index The index of data rate * @return data rate or 0 */ -u32 index_to_data_rate(u8 index) +u32 libertas_index_to_data_rate(u8 index) { if (index >= sizeof(libertas_wlan_data_rates)) index = 0; @@ -4825,7 +4825,7 @@ u32 index_to_data_rate(u8 index) * @param rate data rate * @return index or 0 */ -u8 data_rate_to_index(u32 rate) +u8 libertas_data_rate_to_index(u32 rate) { u8 *ptr; @@ -4893,7 +4893,7 @@ int wlan_set_rate(struct net_device *dev Adapter->Is_DataRate_Auto = 0; } - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_DATA_RATE, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_DATA_RATE, action, HostCmd_OPTION_WAITFORRSP, 0, NULL); LEAVE(); @@ -4984,7 +4984,7 @@ int wlan_set_mode(struct net_device *dev if (Adapter->InfrastructureMode == Wlan802_11Infrastructure) { if (Adapter->PSState != PS_STATE_FULL_POWER) { - PSWakeup(priv, HostCmd_OPTION_WAITFORRSP); + libertas_ps_wakeup(priv, HostCmd_OPTION_WAITFORRSP); } Adapter->PSMode = Wlan802_11PowerModeCAM; } @@ -5013,7 +5013,7 @@ int wlan_set_mode(struct net_device *dev * send REMOVE WEP command, to make sure we clean up * the WEP keys in firmware */ - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SET_WEP, 0, HostCmd_OPTION_WAITFORRSP, OID_802_11_REMOVE_WEP, NULL); @@ -5025,7 +5025,7 @@ int wlan_set_mode(struct net_device *dev Adapter->CurrentPacketFilter &= ~HostCmd_ACT_MAC_WEP_ENABLE; - SetMacPacketFilter(priv); + libertas_set_mac_packet_filter(priv); } Adapter->SecInfo.WEPStatus = Wlan802_11WEPDisabled; @@ -5033,7 +5033,7 @@ int wlan_set_mode(struct net_device *dev Adapter->InfrastructureMode = WantedMode; - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, 0, HostCmd_OPTION_WAITFORRSP, OID_802_11_INFRASTRUCTURE_MODE, NULL); @@ -5130,7 +5130,7 @@ int wlan_set_txpow(struct net_device *de PRINTM(INFO, "<1>TXPOWER SET %d dbm.\n", dbm); - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_RF_TX_POWER, HostCmd_ACT_TX_POWER_OPT_SET_LOW, HostCmd_OPTION_WAITFORRSP, 0, (void *)&dbm); @@ -5196,7 +5196,7 @@ int wlan_get_essid(struct net_device *de * @param maxlen max length of version buffer * @return NA */ -void get_version(wlan_adapter * adapter, char *version, int maxlen) +void libertas_get_version(wlan_adapter * adapter, char *version, int maxlen) { union { u32 l; @@ -5313,7 +5313,7 @@ static int wlan_dft_add_ioctl(wlan_priva #endif LEAVE(); - return (PrepareAndSendCommand(priv, HostCmd_CMD_DFT_ACCESS, + return (libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_DFT_ACCESS_ADD, HostCmd_OPTION_WAITFORRSP, 0, ethaddrs)); } @@ -5344,7 +5344,7 @@ static int wlan_dft_del_ioctl(wlan_priva PRINTM(INFO, "DFT: deleting %s\n", ethaddrs_str); LEAVE(); - return (PrepareAndSendCommand(priv, + return (libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_DFT_ACCESS_DEL, HostCmd_OPTION_WAITFORRSP, 0, ethaddr)); @@ -5362,7 +5362,7 @@ static int wlan_dft_reset_ioctl(wlan_pri PRINTM(MSG, "DFT: resetting\n"); LEAVE(); - return (PrepareAndSendCommand(priv, + return (libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_DFT_ACCESS_RESET, HostCmd_OPTION_WAITFORRSP, 0, NULL)); @@ -5398,7 +5398,7 @@ static int wlan_dft_list_ioctl(wlan_priv pos = sprintf(pbuf, "%d: ", param.id); pbuf += pos; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_DFT_ACCESS, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_DFT_ACCESS_LIST, HostCmd_OPTION_WAITFORRSP, 0, (char *)¶m); @@ -5455,7 +5455,7 @@ static int wlan_bt_add_ioctl(wlan_privat PRINTM(INFO, "BT: adding %s\n", ethaddrs_str); LEAVE(); - return (PrepareAndSendCommand(priv, HostCmd_CMD_DFT_ACCESS, + return (libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_BT_ACCESS_ADD, HostCmd_OPTION_WAITFORRSP, 0, ethaddr)); } @@ -5485,7 +5485,7 @@ static int wlan_bt_del_ioctl(wlan_privat PRINTM(INFO, "BT: deleting %s\n", ethaddrs_str); - return (PrepareAndSendCommand(priv, + return (libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_BT_ACCESS_DEL, HostCmd_OPTION_WAITFORRSP, 0, ethaddr)); @@ -5504,7 +5504,7 @@ static int wlan_bt_reset_ioctl(wlan_priv PRINTM(MSG, "BT: resetting\n"); - return (PrepareAndSendCommand(priv, + return (libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_BT_ACCESS_RESET, HostCmd_OPTION_WAITFORRSP, 0, NULL)); @@ -5543,7 +5543,7 @@ static int wlan_bt_list_ioctl(wlan_priva pos = sprintf(pbuf, "%d: ", param.id); pbuf += pos; - ret = PrepareAndSendCommand(priv, HostCmd_CMD_DFT_ACCESS, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_DFT_ACCESS, HostCmd_ACT_BT_ACCESS_LIST, HostCmd_OPTION_WAITFORRSP, 0, (char *)¶m); Index: linus-2.6/drivers/net/wireless/libertas/wlan_wext.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_wext.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_wext.h @@ -238,7 +238,7 @@ typedef struct _wlan_ioctl_adhoc_key_inf #ifdef __KERNEL__ extern struct iw_handler_def libertas_handler_def; -int wlan_do_ioctl(struct net_device *dev, struct ifreq *req, int i); +int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int i); #endif /** sleep_params */ Index: linus-2.6/drivers/net/wireless/libertas/sbi.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/sbi.h +++ linus-2.6/drivers/net/wireless/libertas/sbi.h @@ -90,29 +90,29 @@ typedef irqreturn_t(*isr_notifier_fn_t) typedef irqreturn_t(*handler_fn_t) (s32 irq, void *dev_id, struct pt_regs *); /* Probe and Check if the card is present*/ -int sbi_probe_card(void *card); -int sbi_register_dev(wlan_private * priv); -int sbi_unregister_dev(wlan_private *); -int sbi_disable_host_int(wlan_private * priv); -int sbi_get_int_status(wlan_private * priv, u8 *); -int *sbi_register(wlan_notifier_fn_add, wlan_notifier_fn_remove, void *); -void sbi_unregister(void); -int sbi_prog_firmware(wlan_private *); -int sbi_verify_fw_download(wlan_private *); - -int sbi_read_event_cause(wlan_private *); -int sbi_reenable_host_interrupt(wlan_private *, u8); -int sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb); -int sbi_enable_host_int(wlan_private *); +int libertas_sbi_probe_card(void *card); +int libertas_sbi_register_dev(wlan_private * priv); +int libertas_sbi_unregister_dev(wlan_private *); +int libertas_sbi_disable_host_int(wlan_private * priv); +int libertas_sbi_get_int_status(wlan_private * priv, u8 *); +int *libertas_sbi_register(wlan_notifier_fn_add, wlan_notifier_fn_remove, void *); +void libertas_sbi_unregister(void); +int libertas_sbi_prog_firmware(wlan_private *); +int libertas_sbi_verify_fw_download(wlan_private *); + +int libertas_sbi_read_event_cause(wlan_private *); +int libertas_sbi_reenable_host_interrupt(wlan_private *, u8); +int libertas_sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb); +int libertas_sbi_enable_host_int(wlan_private *); #ifdef ENABLE_PM -inline int sbi_suspend(wlan_private *); -inline int sbi_resume(wlan_private *); +inline int libertas_sbi_suspend(wlan_private *); +inline int libertas_sbi_resume(wlan_private *); #endif -int sbi_get_cis_info(wlan_private * priv); +int libertas_sbi_get_cis_info(wlan_private * priv); -static inline u32 get_utimeofday(void) +static inline u32 libertas_get_utimeofday(void) { struct timeval t; u32 ut; Index: linus-2.6/drivers/net/wireless/libertas/wlan_11d.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_11d.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_11d.c @@ -60,7 +60,7 @@ static struct chan_freq_power channel_fr {14, 2484, TX_PWR_DEFAULT} }; -extern struct chan_freq_power *wlan_get_region_cfp_table(u8 region, +extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *cfp_no); /** @@ -182,7 +182,7 @@ static u8 wlan_channel_known_11d(u8 chan * @param band band * @return channel frequency */ -u32 chan_2_freq(u8 chan, u8 band) +u32 libertas_chan_2_freq(u8 chan, u8 band) { struct chan_freq_power *cf; u16 cnt; @@ -341,7 +341,7 @@ static u8 wlan_region_chan_supported_11d ENTER(); - if ((cfp = wlan_get_region_cfp_table(region, band, &cfp_no)) == NULL) { + if ((cfp = libertas_get_region_cfp_table(region, band, &cfp_no)) == NULL) { return 0; } @@ -475,7 +475,7 @@ static int wlan_parse_domain_info_11d(st * @param parsed_region_chan pointer to parsed_region_chan_11d * @return PASSIVE if chan is unknown; ACTIVE if chan is known */ -u8 wlan_get_scan_type_11d(u8 chan, +u8 libertas_get_scan_type_11d(u8 chan, struct parsed_region_chan_11d * parsed_region_chan) { u8 scan_type = HostCmd_SCAN_TYPE_PASSIVE; @@ -499,7 +499,7 @@ u8 wlan_get_scan_type_11d(u8 chan, * @param priv pointer to wlan_private * @return ENABLE_11D;DISABLE_11D */ -enum state_11d wlan_get_state_11d(wlan_private * priv) +enum state_11d libertas_get_state_11d(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; struct wlan_802_11d_state *state = &Adapter->State11D; @@ -511,7 +511,7 @@ enum state_11d wlan_get_state_11d(wlan_p * @param priv pointer to wlan_private * @return N/A */ -void wlan_init_11d(wlan_private * priv) +void libertas_init_11d(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; struct wlan_802_11d_state *state = &Adapter->State11D; @@ -542,7 +542,7 @@ static int wlan_enable_11d(wlan_private state->Enable11D = flag; /* send cmd to FW to enable/disable 11D fucntion in FW */ - ret = PrepareAndSendCommand(priv, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SNMP_MIB, HostCmd_ACT_SET, HostCmd_OPTION_WAITFORRSP, @@ -564,12 +564,12 @@ static int wlan_set_domain_info_11d(wlan { int ret; - if (!wlan_get_state_11d(priv)) { + if (!libertas_get_state_11d(priv)) { PRINTM(INFO, "11D: dnld domain Info with 11d disabled\n"); return WLAN_STATUS_SUCCESS; } - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11D_DOMAIN_INFO, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11D_DOMAIN_INFO, HostCmd_ACT_GEN_SET, HostCmd_OPTION_WAITFORRSP, 0, NULL); if (ret) { @@ -586,7 +586,7 @@ static int wlan_set_domain_info_11d(wlan * @param band band * @return WLAN_STATUS_SUCCESS */ -int wlan_set_universaltable(wlan_private * priv, u8 band) +int libertas_set_universaltable(wlan_private * priv, u8 band) { wlan_adapter *Adapter = priv->adapter; u16 size = sizeof(struct chan_freq_power); @@ -622,7 +622,7 @@ int wlan_set_universaltable(wlan_private * @param CmdOption cmd action * @return WLAN_STATUS_SUCCESS */ -int wlan_cmd_802_11d_domain_info(wlan_private * priv, +int libertas_cmd_802_11d_domain_info(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, u16 cmdno, u16 CmdOption) { @@ -681,7 +681,7 @@ int wlan_cmd_802_11d_domain_info(wlan_pr * @param wrq pointer to user data * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq) +int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq) { int data = 0; int *val; @@ -720,7 +720,7 @@ int wlan_cmd_enable_11d(wlan_private * p * @param resp pointer to command response buffer * @return WLAN_STATUS_SUCCESS; WLAN_STATUS_FAILURE */ -int wlan_ret_802_11d_domain_info(wlan_private * priv, +int libertas_ret_802_11d_domain_info(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) { struct HostCmd_DS_802_11D_DOMAIN_INFO_RSP @@ -766,13 +766,13 @@ int wlan_ret_802_11d_domain_info(wlan_pr * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS; WLAN_STATUS_FAILURE */ -int wlan_parse_dnld_countryinfo_11d(wlan_private * priv) +int libertas_parse_dnld_countryinfo_11d(wlan_private * priv) { int ret; wlan_adapter *Adapter = priv->adapter; ENTER(); - if (wlan_get_state_11d(priv) == ENABLE_11D) { + if (libertas_get_state_11d(priv) == ENABLE_11D) { memset(&Adapter->parsed_region_chan, 0, sizeof(struct parsed_region_chan_11d)); @@ -810,7 +810,7 @@ int wlan_parse_dnld_countryinfo_11d(wlan * @param priv pointer to wlan_private * @return WLAN_STATUS_SUCCESS; WLAN_STATUS_FAILURE */ -int wlan_create_dnld_countryinfo_11d(wlan_private * priv) +int libertas_create_dnld_countryinfo_11d(wlan_private * priv) { int ret; wlan_adapter *Adapter = priv->adapter; @@ -820,7 +820,7 @@ int wlan_create_dnld_countryinfo_11d(wla ENTER(); PRINTM(INFO, "11D:CurBssParams.Band[%d]\n", Adapter->CurBssParams.band); - if (wlan_get_state_11d(priv) == ENABLE_11D) { + if (libertas_get_state_11d(priv) == ENABLE_11D) { /* update parsed_region_chan_11; dnld domaininf to FW */ for (j = 0; j < sizeof(Adapter->region_channel) / Index: linus-2.6/drivers/net/wireless/libertas/wlan_11d.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_11d.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_11d.h @@ -132,29 +132,29 @@ int wlan_parse_domain_info_11d(struct IE *parsed_region_chan); #endif -u8 wlan_get_scan_type_11d(u8 chan, +u8 libertas_get_scan_type_11d(u8 chan, struct parsed_region_chan_11d *parsed_region_chan); -u32 chan_2_freq(u8 chan, u8 band); +u32 libertas_chan_2_freq(u8 chan, u8 band); -enum state_11d wlan_get_state_11d(wlan_private * priv); +enum state_11d libertas_get_state_11d(wlan_private * priv); -void wlan_init_11d(wlan_private * priv); +void libertas_init_11d(wlan_private * priv); -int wlan_set_universaltable(wlan_private * priv, u8 band); +int libertas_set_universaltable(wlan_private * priv, u8 band); -int wlan_cmd_802_11d_domain_info(wlan_private * priv, +int libertas_cmd_802_11d_domain_info(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, u16 cmdno, u16 CmdOption); struct iwreq; -int wlan_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq); +int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq); -int wlan_ret_802_11d_domain_info(wlan_private * priv, +int libertas_ret_802_11d_domain_info(wlan_private * priv, struct HostCmd_DS_COMMAND *resp); -int wlan_parse_dnld_countryinfo_11d(wlan_private * priv); +int libertas_parse_dnld_countryinfo_11d(wlan_private * priv); -int wlan_create_dnld_countryinfo_11d(wlan_private * priv); +int libertas_create_dnld_countryinfo_11d(wlan_private * priv); #endif /* _WLAN_11D_ */ Index: linus-2.6/drivers/net/wireless/libertas/wlan_fw.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_fw.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_fw.c @@ -45,9 +45,9 @@ Change log: #include "wlan_fw.h" #include "wlan_wext.h" -char *fw_name = NULL; +char *libertas_fw_name = NULL; -module_param(fw_name, charp, 0644); +module_param_named(fw_name, libertas_fw_name, charp, 0644); /** * @brief This function downloads firmware image, gets @@ -64,17 +64,17 @@ static int wlan_setup_station_hw(wlan_pr ENTER(); - sbi_disable_host_int(priv); + libertas_sbi_disable_host_int(priv); - if ((ret = request_firmware(&priv->firmware, fw_name, + if ((ret = request_firmware(&priv->firmware, libertas_fw_name, priv->hotplug_device)) < 0) { PRINTM(MSG, "request_firmware() failed, error code = %#x\n", ret); - PRINTM(MSG, "%s not found in /lib/firmware\n", fw_name); + PRINTM(MSG, "%s not found in /lib/firmware\n", libertas_fw_name); goto done; } - ret = sbi_prog_firmware(priv); + ret = libertas_sbi_prog_firmware(priv); release_firmware(priv->firmware); @@ -85,7 +85,7 @@ static int wlan_setup_station_hw(wlan_pr } /* check if the fimware is downloaded successfully or not */ - if (sbi_verify_fw_download(priv)) { + if (libertas_sbi_verify_fw_download(priv)) { PRINTM(INFO, "Firmware failed to be active in time!\n"); ret = WLAN_STATUS_FAILURE; goto done; @@ -93,14 +93,14 @@ static int wlan_setup_station_hw(wlan_pr #define RF_REG_OFFSET 0x07 #define RF_REG_VALUE 0xc8 - sbi_enable_host_int(priv); + libertas_sbi_enable_host_int(priv); /* * Read MAC address from HW */ memset(adapter->CurrentAddr, 0xff, ETH_ALEN); - ret = PrepareAndSendCommand(priv, HostCmd_CMD_GET_HW_SPEC, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_GET_HW_SPEC, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); if (ret) { @@ -108,10 +108,10 @@ static int wlan_setup_station_hw(wlan_pr goto done; } - SetMacPacketFilter(priv); + libertas_set_mac_packet_filter(priv); /* Get the supported Data Rates */ - ret = PrepareAndSendCommand(priv, HostCmd_CMD_802_11_DATA_RATE, + ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_DATA_RATE, HostCmd_ACT_GET_TX_RATE, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -144,7 +144,7 @@ static int wlan_allocate_adapter(wlan_pr /* Allocate buffer to store the BSSID list */ ulBufSize = sizeof(struct bss_descriptor) * MRVDRV_MAX_BSSID_LIST; if (!(pTempScanTable = kmalloc(ulBufSize, GFP_KERNEL))) { - wlan_free_adapter(priv); + libertas_free_adapter(priv); return WLAN_STATUS_FAILURE; } @@ -154,16 +154,16 @@ static int wlan_allocate_adapter(wlan_pr spin_lock_init(&Adapter->QueueSpinLock); /* Allocate the command buffers */ - AllocateCmdBuffer(priv); + libertas_allocate_cmd_buffer(priv); - memset(&Adapter->PSConfirmSleep, 0, sizeof(struct PS_CMD_ConfirmSleep)); - Adapter->PSConfirmSleep.SeqNum = wlan_cpu_to_le16(++Adapter->SeqNum); - Adapter->PSConfirmSleep.Command = + memset(&Adapter->libertas_ps_confirm_sleep, 0, sizeof(struct PS_CMD_ConfirmSleep)); + Adapter->libertas_ps_confirm_sleep.SeqNum = wlan_cpu_to_le16(++Adapter->SeqNum); + Adapter->libertas_ps_confirm_sleep.Command = wlan_cpu_to_le16(HostCmd_CMD_802_11_PS_MODE); - Adapter->PSConfirmSleep.Size = + Adapter->libertas_ps_confirm_sleep.Size = wlan_cpu_to_le16(sizeof(struct PS_CMD_ConfirmSleep)); - Adapter->PSConfirmSleep.Result = 0; - Adapter->PSConfirmSleep.Action = + Adapter->libertas_ps_confirm_sleep.Result = 0; + Adapter->libertas_ps_confirm_sleep.Action = wlan_cpu_to_le16(HostCmd_SubCmd_Sleep_Confirmed); return WLAN_STATUS_SUCCESS; @@ -282,7 +282,7 @@ static void command_timer_fn(unsigned lo * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_init_fw(wlan_private * priv) +int libertas_init_fw(wlan_private * priv) { int ret = WLAN_STATUS_SUCCESS; wlan_adapter *Adapter = priv->adapter; @@ -303,7 +303,7 @@ int wlan_init_fw(wlan_private * priv) #ifdef REASSOCIATION /* Initialize the timer for the reassociation */ - setup_timer(&Adapter->reassoc_timer, reassoc_timer_fn, + setup_timer(&Adapter->reassoc_timer, libertas_reassoc_timer_fn, (unsigned long)priv); #endif /* REASSOCIATION */ @@ -314,7 +314,7 @@ int wlan_init_fw(wlan_private * priv) } /* init 802.11d */ - wlan_init_11d(priv); + libertas_init_11d(priv); ret = WLAN_STATUS_SUCCESS; done: @@ -328,7 +328,7 @@ done: * @param priv A pointer to wlan_private structure * @return n/a */ -void wlan_free_adapter(wlan_private * priv) +void libertas_free_adapter(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; @@ -340,7 +340,7 @@ void wlan_free_adapter(wlan_private * pr } PRINTM(INFO, "Free Command buffer\n"); - FreeCmdBuffer(priv); + libertas_free_cmd_buffer(priv); PRINTM(INFO, "Free CommandTimer\n"); del_timer(&Adapter->command_timer); @@ -396,7 +396,7 @@ static void command_timer_fn(unsigned lo spin_unlock_irqrestore(&Adapter->QueueSpinLock, flags); PRINTM(INFO, "Re-sending same command as it timeout...!\n"); - QueueCmd(Adapter, pTempNode, 0); + libertas_queue_cmd(Adapter, pTempNode, 0); wake_up_interruptible(&priv->MainThread.waitQ); @@ -412,7 +412,7 @@ static void command_timer_fn(unsigned lo * @param FunctionContext A pointer to FunctionContext * @return n/a */ -void reassoc_timer_fn(unsigned long data) +void libertas_reassoc_timer_fn(unsigned long data) { wlan_private *priv = (wlan_private *)data; wlan_adapter *Adapter = priv->adapter; @@ -423,7 +423,7 @@ void reassoc_timer_fn(unsigned long data if (Adapter->PSState != PS_STATE_FULL_POWER) { /* wait until Exit_PS command returns */ mod_timer(&Adapter->reassoc_timer, jiffies + 1*HZ); - PRINTM(INFO, "reassoc_timer_fn(PSState=%d) waiting" + PRINTM(INFO, "libertas_reassoc_timer_fn(PSState=%d) waiting" "for Exit_PS done\n", Adapter->PSState); LEAVE(); return; Index: linus-2.6/drivers/net/wireless/libertas/wlan_fw.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_fw.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_fw.h @@ -39,10 +39,6 @@ Change log: #define FIRMWARE_TRANSFER_BLOCK_SIZE 1536 -/** function prototypes */ -int wlan_init_fw(wlan_private * priv); -int wlan_disable_host_int(wlan_private * priv, u8 reg); -int wlan_enable_host_int(wlan_private * priv, u8 mask); -int wlan_free_cmd_buffers(wlan_private * priv); +int libertas_init_fw(wlan_private * priv); #endif /* _WLAN_FW_H_ */ Index: linus-2.6/drivers/net/wireless/libertas/wlan_rx.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_rx.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_rx.c @@ -173,7 +173,7 @@ static void wlan_compute_rssi(wlan_priva * @param skb A pointer to skb which includes the received packet * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int ProcessRxedPacket(wlan_private * priv, struct sk_buff *skb) +int libertas_process_rxed_packet(wlan_private * priv, struct sk_buff *skb) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; @@ -273,7 +273,7 @@ int ProcessRxedPacket(wlan_private * pri * only if the rate is auto */ if (Adapter->Is_DataRate_Auto) { - Adapter->DataRate = index_to_data_rate(pRxPD->RxRate); + Adapter->DataRate = libertas_index_to_data_rate(pRxPD->RxRate); } wlan_compute_rssi(priv, pRxPD); @@ -442,7 +442,7 @@ static int ProcessRxed_802_11_Packet(wla * only if the rate is auto */ if (Adapter->Is_DataRate_Auto) { - Adapter->DataRate = index_to_data_rate(pRxPD->RxRate); + Adapter->DataRate = libertas_index_to_data_rate(pRxPD->RxRate); } wlan_compute_rssi(priv, pRxPD); Index: linus-2.6/drivers/net/wireless/libertas/wlan_tx.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_tx.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_tx.c @@ -112,7 +112,7 @@ static int SendSinglePacket(wlan_private pLocalTxPD->TxPacketLength = skb->len; if (Adapter->PSState != PS_STATE_FULL_POWER) { - if (CheckLastPacketIndication(priv)) { + if (libertas_check_last_packet_indication(priv)) { Adapter->TxLockFlag = 1; pLocalTxPD->PowerMgmt = MRVDRV_TxPD_POWER_MGMT_LAST_PACKET; @@ -158,13 +158,13 @@ static int SendSinglePacket(wlan_private HEXDUMP("Tx Data", (u8 *) p802x_hdr, pLocalTxPD->TxPacketLength); memcpy(ptr, p802x_hdr, pLocalTxPD->TxPacketLength); - ret = sbi_host_to_card(priv, MVMS_DAT, + ret = libertas_sbi_host_to_card(priv, MVMS_DAT, priv->adapter->TmpTxBuf, pLocalTxPD->TxPacketLength + sizeof(struct TxPD)); if (ret) { - PRINTM(INFO, "Tx Error: sbi_host_to_card failed: 0x%X\n", ret); + PRINTM(INFO, "Tx Error: libertas_sbi_host_to_card failed: 0x%X\n", ret); goto done; } @@ -197,7 +197,7 @@ static int SendSinglePacket(wlan_private } -void wlan_tx_runqueue(wlan_private *priv) +void libertas_tx_runqueue(wlan_private *priv) { wlan_adapter *adapter = priv->adapter; int i; @@ -236,7 +236,7 @@ static void wlan_tx_queue(wlan_private * * @param priv A pointer to wlan_private structure * @return n/a */ -int wlan_process_tx(wlan_private * priv, struct sk_buff *skb) +int libertas_process_tx(wlan_private * priv, struct sk_buff *skb) { int ret = WLAN_STATUS_FAILURE; @@ -271,7 +271,7 @@ done: * @param pwr_mgmt indicate if power management bit should be 0 or 1 * @return n/a */ -int SendNullPacket(wlan_private * priv, u8 pwr_mgmt) +int libertas_send_null_packet(wlan_private * priv, u8 pwr_mgmt) { wlan_adapter *Adapter = priv->adapter; struct TxPD txpd; @@ -298,11 +298,11 @@ int SendNullPacket(wlan_private * priv, memcpy(ptr, &txpd, sizeof(struct TxPD)); - ret = sbi_host_to_card(priv, MVMS_DAT, + ret = libertas_sbi_host_to_card(priv, MVMS_DAT, priv->adapter->TmpTxBuf, sizeof(struct TxPD)); if (ret != 0) { - PRINTM(INFO, "TX Error: SendNullPacket failed!\n"); + PRINTM(INFO, "TX Error: libertas_send_null_packet failed!\n"); goto done; } @@ -318,7 +318,7 @@ int SendNullPacket(wlan_private * priv, * * @return TRUE or FALSE */ -u8 CheckLastPacketIndication(wlan_private * priv) +u8 libertas_check_last_packet_indication(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; u8 ret = 0; @@ -337,7 +337,7 @@ u8 CheckLastPacketIndication(wlan_privat * * @returns void */ -void SendTxFeedback(wlan_private * priv) +void libertas_send_tx_feedback(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; struct TxRadiotapHdr *radiotap_hdr; Index: linus-2.6/drivers/net/wireless/libertas/wlan_debug.c =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_debug.c +++ linus-2.6/drivers/net/wireless/libertas/wlan_debug.c @@ -181,7 +181,7 @@ static int wlan_debug_write(struct file * @param dev pointer net_device * @return N/A */ -void wlan_debug_entry(wlan_private * priv, struct net_device *dev) +void libertas_debug_entry(wlan_private * priv, struct net_device *dev) { int i; struct proc_dir_entry *r; @@ -210,7 +210,7 @@ void wlan_debug_entry(wlan_private * pri * @param priv pointer wlan_private * @return N/A */ -void wlan_debug_remove(wlan_private * priv) +void libertas_debug_remove(wlan_private * priv) { remove_proc_entry("debug", priv->proc_entry); } --