This fixes the naming of part of the global symbols in the libertas driver, so they can't conflict with other symbols when built into the kernel. Split into two patches in order to keep mail size < 100kb. 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 @@ -717,10 +717,10 @@ int sbi_get_int_status(wlan_private * pr unsigned long flags; ENTER(); - spin_lock_irqsave(&driver_lock, flags); + spin_lock_irqsave(&libertas_driver_lock, flags); *ireg = usb_int_cause; usb_int_cause = 0; - spin_unlock_irqrestore(&driver_lock, flags); + spin_unlock_irqrestore(&libertas_driver_lock, flags); PRINTM(INFO, "Int cause is 0x%X\n", *ireg); Index: linus-2.6/drivers/net/wireless/libertas/os_macros.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/os_macros.h +++ linus-2.6/drivers/net/wireless/libertas/os_macros.h @@ -23,7 +23,7 @@ #include #include -extern spinlock_t driver_lock; +extern spinlock_t libertas_driver_lock; static inline int CopyMulticastAddrs(wlan_adapter * Adapter, struct net_device *dev) 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 @@ -1504,7 +1504,7 @@ int PrepareAndSendCommand(wlan_private * break; case HostCmd_CMD_802_11_SCAN: - ret = wlan_cmd_802_11_scan(priv, CmdPtr, pdata_buf); + ret = libertas_cmd_80211_scan(priv, CmdPtr, pdata_buf); break; case HostCmd_CMD_MAC_CONTROL: @@ -1513,11 +1513,11 @@ int PrepareAndSendCommand(wlan_private * case HostCmd_CMD_802_11_ASSOCIATE: case HostCmd_CMD_802_11_REASSOCIATE: - ret = wlan_cmd_802_11_associate(priv, CmdPtr, pdata_buf); + ret = libertas_cmd_80211_associate(priv, CmdPtr, pdata_buf); break; case HostCmd_CMD_802_11_DEAUTHENTICATE: - ret = wlan_cmd_802_11_deauthenticate(priv, CmdPtr); + ret = libertas_cmd_80211_deauthenticate(priv, CmdPtr); break; case HostCmd_CMD_802_11_SET_WEP: @@ -1525,7 +1525,7 @@ int PrepareAndSendCommand(wlan_private * break; case HostCmd_CMD_802_11_AD_HOC_START: - ret = wlan_cmd_802_11_ad_hoc_start(priv, CmdPtr, pdata_buf); + ret = libertas_cmd_80211_ad_hoc_start(priv, CmdPtr, pdata_buf); break; case HostCmd_CMD_CODE_DNLD: break; @@ -1539,7 +1539,7 @@ int PrepareAndSendCommand(wlan_private * break; case HostCmd_CMD_802_11_AUTHENTICATE: - ret = wlan_cmd_802_11_authenticate(priv, CmdPtr, pdata_buf); + ret = libertas_cmd_80211_authenticate(priv, CmdPtr, pdata_buf); break; case HostCmd_CMD_802_11_GET_STAT: @@ -1589,7 +1589,7 @@ int PrepareAndSendCommand(wlan_private * break; case HostCmd_CMD_802_11_AD_HOC_JOIN: - ret = wlan_cmd_802_11_ad_hoc_join(priv, CmdPtr, pdata_buf); + ret = libertas_cmd_80211_ad_hoc_join(priv, CmdPtr, pdata_buf); break; case HostCmd_CMD_802_11_RSSI: @@ -1597,7 +1597,7 @@ int PrepareAndSendCommand(wlan_private * break; case HostCmd_CMD_802_11_AD_HOC_STOP: - ret = wlan_cmd_802_11_ad_hoc_stop(priv, CmdPtr); + ret = libertas_cmd_80211_ad_hoc_stop(priv, CmdPtr); break; case HostCmd_CMD_802_11_ENABLE_RSN: @@ -2179,14 +2179,14 @@ static int SendConfirmSleep(wlan_private PRINTM(MSG, "SEND_SLEEPC_CMD: Host to Card Failed for Confirm Sleep\n"); } else { - spin_lock_irqsave(&driver_lock, flags); + spin_lock_irqsave(&libertas_driver_lock, flags); if (!Adapter->IntCounter) { Adapter->PSState = PS_STATE_SLEEP; } else { PRINTM(INFO, "SEND_SLEEPC_CMD: After sent,IntC=%d\n", Adapter->IntCounter); } - spin_unlock_irqrestore(&driver_lock, flags); + spin_unlock_irqrestore(&libertas_driver_lock, flags); PRINTM(INFO, "SEND_SLEEPC_CMD: Sent Confirm Sleep command\n"); PRINTM(INFO, "+"); 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 @@ -58,7 +58,7 @@ Change log: * @param priv A pointer to wlan_private structure * @return n/a */ -void MacEventDisconnected(wlan_private * priv) +void libertas_mac_event_disconnected(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; union iwreq_data wrqu; @@ -152,7 +152,7 @@ static void HandleDisconnectEvent(wlan_p ENTER(); if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { - MacEventDisconnected(priv); + libertas_mac_event_disconnected(priv); #ifdef REASSOCIATION if (Adapter->Reassoc_on) { PRINTM(INFO, "RE-ASSOC: trigger the timer\n"); @@ -287,7 +287,7 @@ static int wlan_ret_get_hw_spec(wlan_pri for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { /* use the region code to search for the index */ - if (Adapter->RegionCode == RegionCodeToIndex[i]) { + if (Adapter->RegionCode == libertas_region_code_to_index[i]) { Adapter->RegionTableIndex = (u16) i; break; } @@ -661,8 +661,8 @@ static int wlan_ret_802_11_data_rate(wla Dot11DataRate = pDataRate->DataRate[0]; if (pDataRate->Action == HostCmd_ACT_GET_TX_RATE) { - memcpy(Adapter->SupportedRates, pDataRate->DataRate, - sizeof(Adapter->SupportedRates)); + memcpy(Adapter->libertas_supported_rates, pDataRate->DataRate, + sizeof(Adapter->libertas_supported_rates)); } Adapter->DataRate = index_to_data_rate(Dot11DataRate); @@ -943,7 +943,7 @@ int wlan_process_rx_command(wlan_private break; case HostCmd_RET_802_11_SCAN: - ret = wlan_ret_802_11_scan(priv, resp); + ret = libertas_ret_80211_scan(priv, resp); break; case HostCmd_RET_MAC_CONTROL: @@ -956,12 +956,12 @@ int wlan_process_rx_command(wlan_private case HostCmd_RET_802_11_ASSOCIATE: case HostCmd_RET_802_11_REASSOCIATE: - ret = wlan_ret_802_11_associate(priv, resp); + ret = libertas_ret_80211_associate(priv, resp); break; case HostCmd_RET_802_11_DISASSOCIATE: case HostCmd_RET_802_11_DEAUTHENTICATE: - ret = wlan_ret_802_11_disassociate(priv, resp); + ret = libertas_ret_80211_disassociate(priv, resp); break; case HostCmd_RET_802_11_SET_WEP: @@ -970,7 +970,7 @@ int wlan_process_rx_command(wlan_private case HostCmd_RET_802_11_AD_HOC_START: case HostCmd_RET_802_11_AD_HOC_JOIN: - ret = wlan_ret_802_11_ad_hoc_start(priv, resp); + ret = libertas_ret_80211_ad_hoc_start(priv, resp); break; case HostCmd_RET_802_11_RESET: @@ -978,7 +978,7 @@ int wlan_process_rx_command(wlan_private break; case HostCmd_RET_802_11_AUTHENTICATE: - ret = wlan_ret_802_11_authenticate(priv, resp); + ret = libertas_ret_80211_authenticate(priv, resp); break; case HostCmd_RET_802_11_STAT: @@ -1031,7 +1031,7 @@ int wlan_process_rx_command(wlan_private break; case HostCmd_RET_802_11_AD_HOC_STOP: - ret = wlan_ret_802_11_ad_hoc_stop(priv, resp); + ret = libertas_ret_80211_ad_hoc_stop(priv, resp); break; case HostCmd_RET_802_11_BEACON_STOP: 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 @@ -106,10 +106,10 @@ void wlan_tx_runqueue(wlan_private *priv void wlan_send_rxskbQ(wlan_private * priv); -extern struct chan_freq_power *find_cfp_by_band_and_channel(wlan_adapter * adapter, +extern struct chan_freq_power *libertas_find_cfp_by_band_and_channel(wlan_adapter * adapter, u8 band, u16 channel); -extern void MacEventDisconnected(wlan_private * priv); +extern void libertas_mac_event_disconnected(wlan_private * priv); void send_iwevcustom_event(wlan_private * priv, s8 * str); Index: linus-2.6/drivers/net/wireless/libertas/wlan_defs.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_defs.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_defs.h @@ -372,16 +372,16 @@ static inline void HEXDUMP(char *prompt, typedef struct _wlan_private wlan_private; typedef struct _wlan_adapter wlan_adapter; -extern const char driver_version[]; -extern u16 RegionCodeToIndex[MRVDRV_MAX_REGION_CODE]; +extern const char libertas_driver_version[]; +extern u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE]; -extern u8 WlanDataRates[WLAN_SUPPORTED_RATES]; +extern u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES]; -extern u8 SupportedRates[G_SUPPORTED_RATES]; +extern u8 libertas_supported_rates[G_SUPPORTED_RATES]; -extern u8 AdhocRates_G[G_SUPPORTED_RATES]; +extern u8 libertas_adhoc_rates_g[G_SUPPORTED_RATES]; -extern u8 AdhocRates_B[4]; +extern u8 libertas_adhoc_rates_b[4]; /** ENUM definition*/ /** SNRNF_TYPE */ 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 @@ -362,7 +362,7 @@ struct _wlan_adapter { u32 Preamble; /** Multi Bands Parameter*/ - u8 SupportedRates[G_SUPPORTED_RATES]; + u8 libertas_supported_rates[G_SUPPORTED_RATES]; /** Blue Tooth Co-existence Arbitration */ 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 @@ -120,7 +120,7 @@ static int get_common_rates(wlan_adapter * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS--success, otherwise fail */ -int wlan_send_deauth(wlan_private * priv) +int libertas_send_deauth(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; @@ -130,7 +130,7 @@ int wlan_send_deauth(wlan_private * priv if (Adapter->InfrastructureMode == Wlan802_11Infrastructure && Adapter->MediaConnectStatus == WlanMediaStateConnected) { - ret = SendDeauthentication(priv); + ret = libertas_send_deauthentication(priv); } else { LEAVE(); @@ -147,7 +147,7 @@ int wlan_send_deauth(wlan_private * priv * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlan_do_adhocstop_ioctl(wlan_private * priv) +int libertas_do_adhocstop_ioctl(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; @@ -157,7 +157,7 @@ int wlan_do_adhocstop_ioctl(wlan_private if (Adapter->InfrastructureMode == Wlan802_11IBSS && Adapter->MediaConnectStatus == WlanMediaStateConnected) { - ret = StopAdhocNetwork(priv); + ret = libertas_stop_adhoc_network(priv); } else { LEAVE(); @@ -211,7 +211,7 @@ int wlan_set_essid(struct net_device *de * Check if we asked for `any' or 'particular' */ if (!dwrq->flags) { - if (FindBestNetworkSsid(priv, &reqSSID)) { + if (libertas_find_best_network_SSID(priv, &reqSSID)) { PRINTM(INFO, "Could not find best network\n"); ret = WLAN_STATUS_SUCCESS; goto setessid_ret; @@ -239,15 +239,15 @@ int wlan_set_essid(struct net_device *de if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { PRINTM(INFO, "Already Connected ..\n"); - ret = SendDeauthentication(priv); + ret = libertas_send_deauthentication(priv); if (ret) { goto setessid_ret; } } if (Adapter->Prescan) - SendSpecificSSIDScan(priv, &reqSSID, 1); - i = FindSSIDInList(Adapter, &reqSSID, NULL, + libertas_send_specific_SSID_scan(priv, &reqSSID, 1); + i = libertas_find_SSID_in_list(Adapter, &reqSSID, NULL, Wlan802_11Infrastructure); if (i >= 0) { PRINTM(INFO, @@ -259,13 +259,13 @@ int wlan_set_essid(struct net_device *de goto setessid_ret; } } else { /* i >= 0 */ - ret = i; /* return -ENETUNREACH, passed from FindSSIDInList */ + ret = i; /* return -ENETUNREACH, passed from libertas_find_SSID_in_list */ goto setessid_ret; } } else { /* ad hoc mode */ /* If the requested SSID matches current SSID return */ - if (!SSIDcmp(&Adapter->CurBssParams.ssid, &reqSSID)) { + if (!libertas_SSID_cmp(&Adapter->CurBssParams.ssid, &reqSSID)) { ret = WLAN_STATUS_SUCCESS; goto setessid_ret; } @@ -275,7 +275,7 @@ int wlan_set_essid(struct net_device *de * Exit Adhoc mode */ PRINTM(INFO, "Sending Adhoc Stop\n"); - ret = StopAdhocNetwork(priv); + ret = libertas_stop_adhoc_network(priv); if (ret) { goto setessid_ret; @@ -286,21 +286,21 @@ int wlan_set_essid(struct net_device *de /* Scan for the network, do not save previous results. Stale * scan data will cause us to join a non-existant adhoc network */ - SendSpecificSSIDScan(priv, &reqSSID, 0); + libertas_send_specific_SSID_scan(priv, &reqSSID, 0); /* Search for the requested SSID in the scan table */ - i = FindSSIDInList(Adapter, &reqSSID, NULL, Wlan802_11IBSS); + i = libertas_find_SSID_in_list(Adapter, &reqSSID, NULL, Wlan802_11IBSS); if (i >= 0) { PRINTM(INFO, "SSID found at %d in List, so join\n", i); - JoinAdhocNetwork(priv, &Adapter->ScanTable[i]); + libertas_join_adhoc_network(priv, &Adapter->ScanTable[i]); } else { /* else send START command */ PRINTM(INFO, "SSID not found in list, " "so creating adhoc with ssid = %s\n", reqSSID.Ssid); - StartAdhocNetwork(priv, &reqSSID); + libertas_start_adhoc_network(priv, &reqSSID); } /* end of else (START command) */ } /* end of else (Ad hoc mode) */ @@ -333,7 +333,7 @@ int wlan_set_essid(struct net_device *de * @param extra A pointer to extra data buf * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlan_set_wap(struct net_device *dev, struct iw_request_info *info, +int libertas_set_wap(struct net_device *dev, struct iw_request_info *info, struct sockaddr *awrq, char *extra) { wlan_private *priv = dev->priv; @@ -361,7 +361,7 @@ int wlan_set_wap(struct net_device *dev, #endif /* REASSOCIATION */ if (!memcmp(bcast, awrq->sa_data, ETH_ALEN)) { - i = FindBestSSIDInList(Adapter); + i = libertas_find_best_SSID_in_list(Adapter); } else { memcpy(reqBSSID, awrq->sa_data, ETH_ALEN); @@ -371,7 +371,7 @@ int wlan_set_wap(struct net_device *dev, reqBSSID[4], reqBSSID[5]); /* Search for index position in list for requested MAC */ - i = FindBSSIDInList(Adapter, reqBSSID, + i = libertas_find_BSSID_in_list(Adapter, reqBSSID, Adapter->InfrastructureMode); } @@ -383,7 +383,7 @@ int wlan_set_wap(struct net_device *dev, if (Adapter->InfrastructureMode == Wlan802_11Infrastructure) { if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { - ret = SendDeauthentication(priv); + ret = libertas_send_deauthentication(priv); if (ret) { LEAVE(); @@ -399,7 +399,7 @@ int wlan_set_wap(struct net_device *dev, } else { if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { /* Exit Adhoc mode */ - ret = StopAdhocNetwork(priv); + ret = libertas_stop_adhoc_network(priv); if (ret) { LEAVE(); @@ -407,7 +407,7 @@ int wlan_set_wap(struct net_device *dev, } } - JoinAdhocNetwork(priv, &Adapter->ScanTable[i]); + libertas_join_adhoc_network(priv, &Adapter->ScanTable[i]); } /* Check to see if we successfully connected */ @@ -456,7 +456,7 @@ static int wlan_associate(wlan_private * * @param AdhocSSID The ssid of the Adhoc Network * @return WLAN_STATUS_SUCCESS--success, WLAN_STATUS_FAILURE--fail */ -int StartAdhocNetwork(wlan_private * priv, struct WLAN_802_11_SSID *AdhocSSID) +int libertas_start_adhoc_network(wlan_private * priv, struct WLAN_802_11_SSID *AdhocSSID) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; @@ -496,24 +496,24 @@ int StartAdhocNetwork(wlan_private * pri * * @return WLAN_STATUS_SUCCESS--success, WLAN_STATUS_FAILURE--fail */ -int JoinAdhocNetwork(wlan_private * priv, struct bss_descriptor * pBSSDesc) +int libertas_join_adhoc_network(wlan_private * priv, struct bss_descriptor * pBSSDesc) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; ENTER(); - PRINTM(INFO, "JoinAdhocNetwork: CurBss.ssid =%s\n", + PRINTM(INFO, "libertas_join_adhoc_network: CurBss.ssid =%s\n", Adapter->CurBssParams.ssid.Ssid); - PRINTM(INFO, "JoinAdhocNetwork: CurBss.ssid_len =%u\n", + PRINTM(INFO, "libertas_join_adhoc_network: CurBss.ssid_len =%u\n", Adapter->CurBssParams.ssid.SsidLength); - PRINTM(INFO, "JoinAdhocNetwork: ssid =%s\n", pBSSDesc->Ssid.Ssid); - PRINTM(INFO, "JoinAdhocNetwork: ssid len =%u\n", + PRINTM(INFO, "libertas_join_adhoc_network: ssid =%s\n", pBSSDesc->Ssid.Ssid); + PRINTM(INFO, "libertas_join_adhoc_network: ssid len =%u\n", pBSSDesc->Ssid.SsidLength); /* check if the requested SSID is already joined */ if (Adapter->CurBssParams.ssid.SsidLength - && !SSIDcmp(&pBSSDesc->Ssid, &Adapter->CurBssParams.ssid) + && !libertas_SSID_cmp(&pBSSDesc->Ssid, &Adapter->CurBssParams.ssid) && (Adapter->CurBssParams.BSSDescriptor.InfrastructureMode == Wlan802_11IBSS)) { @@ -562,7 +562,7 @@ int JoinAdhocNetwork(wlan_private * priv * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS--success, WLAN_STATUS_FAILURE--fail */ -int StopAdhocNetwork(wlan_private * priv) +int libertas_stop_adhoc_network(wlan_private * priv) { return PrepareAndSendCommand(priv, HostCmd_CMD_802_11_AD_HOC_STOP, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -574,7 +574,7 @@ int StopAdhocNetwork(wlan_private * priv * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS--success, WLAN_STATUS_FAILURE--fail */ -int SendDeauthentication(wlan_private * priv) +int libertas_send_deauthentication(wlan_private * priv) { return PrepareAndSendCommand(priv, HostCmd_CMD_802_11_DEAUTHENTICATE, 0, HostCmd_OPTION_WAITFORRSP, 0, NULL); @@ -586,7 +586,7 @@ int SendDeauthentication(wlan_private * * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlanidle_off(wlan_private * priv) +int libertas_idle_off(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; @@ -611,17 +611,17 @@ int wlanidle_off(wlan_private * priv) Adapter->PreviousBSSID[4], Adapter->PreviousBSSID[5]); - i = FindSSIDInList(Adapter, + i = libertas_find_SSID_in_list(Adapter, &Adapter->PreviousSSID, Adapter->PreviousBSSID, Adapter->InfrastructureMode); if (i < 0) { - SendSpecificBSSIDScan(priv, + libertas_send_specific_BSSID_scan(priv, Adapter-> PreviousBSSID, 1); - i = FindSSIDInList(Adapter, + i = libertas_find_SSID_in_list(Adapter, &Adapter-> PreviousSSID, Adapter-> @@ -632,7 +632,7 @@ int wlanidle_off(wlan_private * priv) if (i < 0) { /* If the BSSID could not be found, try just the SSID */ - i = FindSSIDInList(Adapter, + i = libertas_find_SSID_in_list(Adapter, &Adapter-> PreviousSSID, NULL, Adapter-> @@ -640,11 +640,11 @@ int wlanidle_off(wlan_private * priv) } if (i < 0) { - SendSpecificSSIDScan(priv, + libertas_send_specific_SSID_scan(priv, &Adapter-> PreviousSSID, 1); - i = FindSSIDInList(Adapter, + i = libertas_find_SSID_in_list(Adapter, &Adapter-> PreviousSSID, NULL, Adapter-> @@ -679,7 +679,7 @@ int wlanidle_off(wlan_private * priv) * @param priv A pointer to wlan_private structure * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlanidle_on(wlan_private * priv) +int libertas_idle_on(wlan_private * priv) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; @@ -693,10 +693,10 @@ int wlanidle_on(wlan_private * priv) memmove(&Adapter->PreviousSSID, &Adapter->CurBssParams.ssid, sizeof(struct WLAN_802_11_SSID)); - wlan_send_deauth(priv); + libertas_send_deauth(priv); } else if (Adapter->InfrastructureMode == Wlan802_11IBSS) { - ret = StopAdhocNetwork(priv); + ret = libertas_stop_adhoc_network(priv); } } @@ -719,7 +719,7 @@ int wlanidle_on(wlan_private * priv) * * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_cmd_802_11_authenticate(wlan_private * priv, +int libertas_cmd_80211_authenticate(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf) { @@ -749,7 +749,7 @@ int wlan_cmd_802_11_authenticate(wlan_pr * @param cmd A pointer to HostCmd_DS_COMMAND structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_cmd_802_11_deauthenticate(wlan_private * priv, +int libertas_cmd_80211_deauthenticate(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd) { wlan_adapter *Adapter = priv->adapter; @@ -782,7 +782,7 @@ int wlan_cmd_802_11_deauthenticate(wlan_ * @param pdata_buf Void cast of BSSDescriptor_t from the scan table to assoc * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_cmd_802_11_associate(wlan_private * priv, +int libertas_cmd_80211_associate(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf) { wlan_adapter *Adapter = priv->adapter; @@ -860,10 +860,10 @@ int wlan_cmd_802_11_associate(wlan_priva rates = (struct MrvlIEtypes_RatesParamSet *) pos; rates->Header.Type = wlan_cpu_to_le16(TLV_TYPE_RATES); - memcpy(&rates->Rates, &pBSSDesc->SupportedRates, WLAN_SUPPORTED_RATES); + memcpy(&rates->Rates, &pBSSDesc->libertas_supported_rates, WLAN_SUPPORTED_RATES); - card_rates = SupportedRates; - card_rates_size = sizeof(SupportedRates); + card_rates = libertas_supported_rates; + card_rates_size = sizeof(libertas_supported_rates); if (get_common_rates(Adapter, rates->Rates, WLAN_SUPPORTED_RATES, card_rates, card_rates_size)) { @@ -933,7 +933,7 @@ int wlan_cmd_802_11_associate(wlan_priva * @param pssid A pointer to WLAN_802_11_SSID structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_cmd_802_11_ad_hoc_start(wlan_private * priv, +int libertas_cmd_80211_ad_hoc_start(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pssid) { wlan_adapter *Adapter = priv->adapter; @@ -1044,11 +1044,11 @@ int wlan_cmd_802_11_ad_hoc_start(wlan_pr memset(adhs->DataRate, 0, sizeof(adhs->DataRate)); if (Adapter->adhoc_grate_enabled) { - memcpy(adhs->DataRate, AdhocRates_G, - min(sizeof(adhs->DataRate), sizeof(AdhocRates_G))); + memcpy(adhs->DataRate, libertas_adhoc_rates_g, + min(sizeof(adhs->DataRate), sizeof(libertas_adhoc_rates_g))); } else { - memcpy(adhs->DataRate, AdhocRates_B, - min(sizeof(adhs->DataRate), sizeof(AdhocRates_B))); + memcpy(adhs->DataRate, libertas_adhoc_rates_b, + min(sizeof(adhs->DataRate), sizeof(libertas_adhoc_rates_b))); } /* Find the last non zero */ @@ -1093,7 +1093,7 @@ int wlan_cmd_802_11_ad_hoc_start(wlan_pr * @param cmd A pointer to HostCmd_DS_COMMAND structure * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_cmd_802_11_ad_hoc_stop(wlan_private * priv, +int libertas_cmd_80211_ad_hoc_stop(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd) { cmd->Command = wlan_cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_STOP); @@ -1113,7 +1113,7 @@ int wlan_cmd_802_11_ad_hoc_stop(wlan_pri * * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_cmd_802_11_ad_hoc_join(wlan_private * priv, +int libertas_cmd_80211_ad_hoc_join(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf) { wlan_adapter *Adapter = priv->adapter; @@ -1185,8 +1185,8 @@ int wlan_cmd_802_11_ad_hoc_join(wlan_pri min(sizeof(pAdHocJoin->BssDescriptor.DataRates), sizeof(pBSSDesc->DataRates))); - card_rates = SupportedRates; - card_rates_size = sizeof(SupportedRates); + card_rates = libertas_supported_rates; + card_rates_size = sizeof(libertas_supported_rates); Adapter->CurBssParams.channel = pBSSDesc->Channel; @@ -1262,7 +1262,7 @@ int wlan_cmd_802_11_ad_hoc_join(wlan_pri * @param resp A pointer to HostCmd_DS_COMMAND * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_ret_802_11_authenticate(wlan_private * priv, +int libertas_ret_80211_authenticate(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) { return WLAN_STATUS_SUCCESS; @@ -1275,7 +1275,7 @@ int wlan_ret_802_11_authenticate(wlan_pr * @param resp A pointer to HostCmd_DS_COMMAND * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_ret_802_11_associate(wlan_private * priv, +int libertas_ret_80211_associate(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) { wlan_adapter *Adapter = priv->adapter; @@ -1291,7 +1291,7 @@ int wlan_ret_802_11_associate(wlan_priva if (pAssocRsp->StatusCode) { if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { - MacEventDisconnected(priv); + libertas_mac_event_disconnected(priv); } PRINTM(INFO, @@ -1365,12 +1365,12 @@ int wlan_ret_802_11_associate(wlan_priva * @param resp A pointer to HostCmd_DS_COMMAND * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_ret_802_11_disassociate(wlan_private * priv, +int libertas_ret_80211_disassociate(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) { ENTER(); - MacEventDisconnected(priv); + libertas_mac_event_disconnected(priv); LEAVE(); return WLAN_STATUS_SUCCESS; @@ -1383,7 +1383,7 @@ int wlan_ret_802_11_disassociate(wlan_pr * @param resp A pointer to HostCmd_DS_COMMAND * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_ret_802_11_ad_hoc_start(wlan_private * priv, +int libertas_ret_80211_ad_hoc_start(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) { wlan_adapter *Adapter = priv->adapter; @@ -1410,7 +1410,7 @@ int wlan_ret_802_11_ad_hoc_start(wlan_pr if (Result) { PRINTM(INFO, "ADHOC_RESP Failed\n"); if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { - MacEventDisconnected(priv); + libertas_mac_event_disconnected(priv); } memset(&Adapter->CurBssParams.BSSDescriptor, @@ -1480,12 +1480,12 @@ int wlan_ret_802_11_ad_hoc_start(wlan_pr * @param resp A pointer to HostCmd_DS_COMMAND * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_ret_802_11_ad_hoc_stop(wlan_private * priv, +int libertas_ret_80211_ad_hoc_stop(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) { ENTER(); - MacEventDisconnected(priv); + libertas_mac_event_disconnected(priv); LEAVE(); return WLAN_STATUS_SUCCESS; @@ -1499,7 +1499,7 @@ int wlan_ret_802_11_ad_hoc_stop(wlan_pri * @param data A pointer to wlan_thread structure * @return WLAN_STATUS_SUCCESS */ -int wlan_reassociation_thread(void *data) +int libertas_reassociation_thread(void *data) { struct wlan_thread *thread = data; wlan_private *priv = thread->priv; @@ -1541,9 +1541,9 @@ int wlan_reassociation_thread(void *data } /* The semaphore is used to avoid reassociation thread and - wlan_set_scan/wlan_set_essid interrupting each other. + libertas_set_scan/wlan_set_essid interrupting each other. Reassociation should be disabled completely by application if - wlan_set_user_scan_ioctl/wlan_set_wap is used. + libertas_set_user_scan_ioctl/libertas_set_wap is used. */ if (down_interruptible(&Adapter->ReassocSem)) { PRINTM(FATAL, @@ -1564,17 +1564,17 @@ int wlan_reassociation_thread(void *data PRINTM(INFO, "Reassoc: Performing Active Scan @ %lu\n", jiffies); - SendSpecificSSIDScan(priv, &Adapter->PreviousSSID, 1); + libertas_send_specific_SSID_scan(priv, &Adapter->PreviousSSID, 1); /* Try to find the specific BSSID we were associated to first */ - i = FindSSIDInList(Adapter, + i = libertas_find_SSID_in_list(Adapter, &Adapter->PreviousSSID, Adapter->PreviousBSSID, Adapter->InfrastructureMode); if (i < 0) { /* If the BSSID could not be found, try just the SSID */ - i = FindSSIDInList(Adapter, + i = libertas_find_SSID_in_list(Adapter, &Adapter->PreviousSSID, NULL, Adapter->InfrastructureMode); } Index: linus-2.6/drivers/net/wireless/libertas/wlan_join.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_join.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_join.h @@ -43,56 +43,56 @@ Change Log: #define MRVDRV_ASSOC_RSP_BUF_SIZE 500 struct HostCmd_DS_COMMAND; -extern int wlan_cmd_802_11_authenticate(wlan_private * priv, +extern int libertas_cmd_80211_authenticate(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf); -extern int wlan_cmd_802_11_ad_hoc_join(wlan_private * priv, +extern int libertas_cmd_80211_ad_hoc_join(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf); -extern int wlan_cmd_802_11_ad_hoc_stop(wlan_private * priv, +extern int libertas_cmd_80211_ad_hoc_stop(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd); -extern int wlan_cmd_802_11_ad_hoc_start(wlan_private * priv, +extern int libertas_cmd_80211_ad_hoc_start(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pssid); -extern int wlan_cmd_802_11_deauthenticate(wlan_private * priv, +extern int libertas_cmd_80211_deauthenticate(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd); -extern int wlan_cmd_802_11_associate(wlan_private * priv, +extern int libertas_cmd_80211_associate(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf); -extern int wlan_ret_802_11_authenticate(wlan_private * priv, +extern int libertas_ret_80211_authenticate(wlan_private * priv, struct HostCmd_DS_COMMAND *resp); -extern int wlan_ret_802_11_ad_hoc_start(wlan_private * priv, +extern int libertas_ret_80211_ad_hoc_start(wlan_private * priv, struct HostCmd_DS_COMMAND *resp); -extern int wlan_ret_802_11_ad_hoc_stop(wlan_private * priv, +extern int libertas_ret_80211_ad_hoc_stop(wlan_private * priv, struct HostCmd_DS_COMMAND *resp); -extern int wlan_ret_802_11_disassociate(wlan_private * priv, +extern int libertas_ret_80211_disassociate(wlan_private * priv, struct HostCmd_DS_COMMAND *resp); -extern int wlan_ret_802_11_associate(wlan_private * priv, +extern int libertas_ret_80211_associate(wlan_private * priv, struct HostCmd_DS_COMMAND *resp); -extern int wlanidle_on(wlan_private * priv); -extern int wlanidle_off(wlan_private * priv); +extern int libertas_idle_on(wlan_private * priv); +extern int libertas_idle_off(wlan_private * priv); -extern int wlan_do_adhocstop_ioctl(wlan_private * priv); -extern int wlan_reassociation_thread(void *data); +extern int libertas_do_adhocstop_ioctl(wlan_private * priv); +extern int libertas_reassociation_thread(void *data); struct WLAN_802_11_SSID; struct bss_descriptor; -extern int StartAdhocNetwork(wlan_private * priv, +extern int libertas_start_adhoc_network(wlan_private * priv, struct WLAN_802_11_SSID *AdhocSSID); -extern int JoinAdhocNetwork(wlan_private * priv, struct bss_descriptor *pBSSDesc); -extern int StopAdhocNetwork(wlan_private * priv); +extern int libertas_join_adhoc_network(wlan_private * priv, struct bss_descriptor *pBSSDesc); +extern int libertas_stop_adhoc_network(wlan_private * priv); -extern int SendDeauthentication(wlan_private * priv); -extern int wlan_send_deauth(wlan_private * priv); +extern int libertas_send_deauthentication(wlan_private * priv); +extern int libertas_send_deauth(wlan_private * priv); -extern int wlan_do_adhocstop_ioctl(wlan_private * priv); +extern int libertas_do_adhocstop_ioctl(wlan_private * priv); #ifdef __KERNEL__ struct iw_request_info; -extern int wlan_set_wap(struct net_device *dev, struct iw_request_info *info, +extern int libertas_set_wap(struct net_device *dev, struct iw_request_info *info, struct sockaddr *awrq, char *extra); #endif 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 @@ -64,7 +64,7 @@ Change log: static struct pm_dev *wlan_pm_dev = NULL; #endif -spinlock_t driver_lock = SPIN_LOCK_UNLOCKED; +spinlock_t libertas_driver_lock = SPIN_LOCK_UNLOCKED; #define WLAN_TX_PWR_DEFAULT 20 /*100mW */ #define WLAN_TX_PWR_US_DEFAULT 20 /*100mW */ @@ -182,7 +182,7 @@ static struct region_cfp_table region_cf /** * the rates supported by the card */ -u8 WlanDataRates[WLAN_SUPPORTED_RATES] = +u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES] = { 0x02, 0x04, 0x0B, 0x16, 0x00, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x00 }; @@ -190,21 +190,21 @@ u8 WlanDataRates[WLAN_SUPPORTED_RATES] = /** * the rates supported */ -u8 SupportedRates[G_SUPPORTED_RATES] = +u8 libertas_supported_rates[G_SUPPORTED_RATES] = { 0x82, 0x84, 0x8b, 0x96, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c, 0 }; /** * the rates supported for ad-hoc G mode */ -u8 AdhocRates_G[G_SUPPORTED_RATES] = +u8 libertas_adhoc_rates_g[G_SUPPORTED_RATES] = { 0x82, 0x84, 0x8b, 0x96, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c, 0 }; /** * the rates supported for ad-hoc B mode */ -u8 AdhocRates_B[4] = { 0x82, 0x84, 0x8b, 0x96 }; +u8 libertas_adhoc_rates_b[4] = { 0x82, 0x84, 0x8b, 0x96 }; /** * the global variable of a pointer to wlan_private @@ -215,7 +215,7 @@ static wlan_private *wlanpriv = NULL; /** * the table to keep region code */ -u16 RegionCodeToIndex[MRVDRV_MAX_REGION_CODE] = +u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE] = { 0x10, 0x20, 0x30, 0x31, 0x32, 0x40 }; static u8 *default_fw_name = "usb8388.bin"; @@ -660,18 +660,18 @@ static int wlan_service_main_thread(void } if (Adapter->IntCounter) { - spin_lock_irqsave(&driver_lock, flags); + spin_lock_irqsave(&libertas_driver_lock, flags); Adapter->IntCounter = 0; - spin_unlock_irqrestore(&driver_lock, flags); + spin_unlock_irqrestore(&libertas_driver_lock, flags); if (sbi_get_int_status(priv, &ireg)) { PRINTM(INFO, "main-thread: reading HOST_INT_STATUS_REG failed\n"); continue; } - spin_lock_irqsave(&driver_lock, flags); + spin_lock_irqsave(&libertas_driver_lock, flags); Adapter->HisRegCpy |= ireg; - spin_unlock_irqrestore(&driver_lock, flags); + spin_unlock_irqrestore(&libertas_driver_lock, flags); } PRINTM(INFO, "main-thread 444: IntCounter=%d CurrentTxSkb=%p " @@ -683,9 +683,9 @@ static int wlan_service_main_thread(void if (Adapter->HisRegCpy & HIS_CmdUpLdRdy) { PRINTM(INFO, "main-thread: Cmd response ready.\n"); - spin_lock_irqsave(&driver_lock, flags); + spin_lock_irqsave(&libertas_driver_lock, flags); Adapter->HisRegCpy &= ~HIS_CmdUpLdRdy; - spin_unlock_irqrestore(&driver_lock, flags); + spin_unlock_irqrestore(&libertas_driver_lock, flags); wlan_process_rx_command(priv); } @@ -694,9 +694,9 @@ static int wlan_service_main_thread(void if (Adapter->HisRegCpy & HIS_CardEvent) { PRINTM(INFO, "main-thread: Card Event Activity.\n"); - spin_lock_irqsave(&driver_lock, flags); + spin_lock_irqsave(&libertas_driver_lock, flags); Adapter->HisRegCpy &= ~HIS_CardEvent; - spin_unlock_irqrestore(&driver_lock, flags); + spin_unlock_irqrestore(&libertas_driver_lock, flags); if (sbi_read_event_cause(priv)) { PRINTM(MSG, @@ -811,7 +811,7 @@ static wlan_private *wlan_add_card(void dev->watchdog_timeo = WLAN_WATCHDOG_TIMEOUT; #ifdef WIRELESS_EXT - dev->wireless_handlers = (struct iw_handler_def *)&wlan_handler_def; + dev->wireless_handlers = (struct iw_handler_def *)&libertas_handler_def; #endif #define NETIF_F_DYNALLOC 16 dev->features |= NETIF_F_DYNALLOC; @@ -835,7 +835,7 @@ static wlan_private *wlan_add_card(void #ifdef REASSOCIATION priv->ReassocThread.priv = priv; - wlan_create_thread(wlan_reassociation_thread, + wlan_create_thread(libertas_reassociation_thread, &priv->ReassocThread, "wlan_reassoc_service"); #endif /* REASSOCIATION */ 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 @@ -74,7 +74,7 @@ static int wlan_proc_read(char *page, ch get_version(priv->adapter, fmt, sizeof(fmt) - 1); p += sprintf(p, "driver_name = " "\"wlan\"\n"); - p += sprintf(p, "driver_version = %s", fmt); + p += sprintf(p, "libertas_driver_version = %s", fmt); p += sprintf(p, "\nInterfaceName=\"%s\"\n", netdev->name); p += sprintf(p, "Mode=\"%s\"\n", szModes[priv->adapter->InfrastructureMode]); 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 @@ -290,7 +290,7 @@ static void wlan_scan_process_results(wl if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { /* try to find the current BSSID in the new scan list */ for (i = 0; i < Adapter->NumInScanTable; i++) { - if (!SSIDcmp(&Adapter->ScanTable[i].Ssid, + if (!libertas_SSID_cmp(&Adapter->ScanTable[i].Ssid, &Adapter->CurBssParams.ssid) && !memcmp(Adapter->CurBssParams.bssid, Adapter->ScanTable[i].MacAddress, @@ -1135,7 +1135,7 @@ static int InterpretBSSDescriptionWithIE case SUPPORTED_RATES: memcpy(pBSSEntry->DataRates, (pCurrentPtr + 2), elemLen); - memmove(pBSSEntry->SupportedRates, (pCurrentPtr + 2), + memmove(pBSSEntry->libertas_supported_rates, (pCurrentPtr + 2), elemLen); rateSize = elemLen; foundDataRateIE = 1; @@ -1230,7 +1230,7 @@ static int InterpretBSSDescriptionWithIE pRate += rateSize; memmove(pRate, (pCurrentPtr + 2), bytesToCopy); - pRate = (u8 *) pBSSEntry->SupportedRates; + pRate = (u8 *) pBSSEntry->libertas_supported_rates; pRate += rateSize; memmove(pRate, (pCurrentPtr + 2), bytesToCopy); @@ -1288,7 +1288,7 @@ static int InterpretBSSDescriptionWithIE * * @return 0--ssid is same, otherwise is different */ -int SSIDcmp(struct WLAN_802_11_SSID *ssid1, struct WLAN_802_11_SSID *ssid2) +int libertas_SSID_cmp(struct WLAN_802_11_SSID *ssid1, struct WLAN_802_11_SSID *ssid2) { if (!ssid1 || !ssid2) return -1; @@ -1308,7 +1308,7 @@ int SSIDcmp(struct WLAN_802_11_SSID *ssi * * @return index in BSSID list, or error return code (< 0) */ -int FindBSSIDInList(wlan_adapter * Adapter, u8 * bssid, int mode) +int libertas_find_BSSID_in_list(wlan_adapter * Adapter, u8 * bssid, int mode) { int ret = -ENETUNREACH; int i; @@ -1352,7 +1352,7 @@ int FindBSSIDInList(wlan_adapter * Adapt * * @return index in BSSID list */ -int FindSSIDInList(wlan_adapter * Adapter, +int libertas_find_SSID_in_list(wlan_adapter * Adapter, struct WLAN_802_11_SSID *ssid, u8 * bssid, int mode) { int net = -ENETUNREACH; @@ -1363,7 +1363,7 @@ int FindSSIDInList(wlan_adapter * Adapte PRINTM(INFO, "Num of Entries in Table = %d\n", Adapter->NumInScanTable); for (i = 0; i < Adapter->NumInScanTable; i++) { - if (!SSIDcmp(&Adapter->ScanTable[i].Ssid, ssid) && + if (!libertas_SSID_cmp(&Adapter->ScanTable[i].Ssid, ssid) && (!bssid || !memcmp(Adapter->ScanTable[i]. MacAddress, bssid, ETH_ALEN))) { @@ -1419,7 +1419,7 @@ int FindSSIDInList(wlan_adapter * Adapte * * @return index in BSSID list */ -int FindBestSSIDInList(wlan_adapter * Adapter) +int libertas_find_best_SSID_in_list(wlan_adapter * Adapter) { int mode = Adapter->InfrastructureMode; int bestnet = -ENETUNREACH; @@ -1467,7 +1467,7 @@ int FindBestSSIDInList(wlan_adapter * Ad * * @return WLAN_STATUS_SUCCESS--success, otherwise--fail */ -int FindBestNetworkSsid(wlan_private * priv, struct WLAN_802_11_SSID *pSSID) +int libertas_find_best_network_SSID(wlan_private * priv, struct WLAN_802_11_SSID *pSSID) { wlan_adapter *Adapter = priv->adapter; int ret = WLAN_STATUS_SUCCESS; @@ -1480,7 +1480,7 @@ int FindBestNetworkSsid(wlan_private * p wlan_scan_networks(priv, NULL); - i = FindBestSSIDInList(Adapter); + i = libertas_find_best_SSID_in_list(Adapter); if (i >= 0) { @@ -1525,7 +1525,7 @@ int FindBestNetworkSsid(wlan_private * p * * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlan_set_scan(struct net_device *dev, struct iw_request_info *info, +int libertas_set_scan(struct net_device *dev, struct iw_request_info *info, struct iw_param *vwrq, char *extra) { wlan_private *priv = dev->priv; @@ -1536,7 +1536,7 @@ int wlan_set_scan(struct net_device *dev #ifdef REASSOCIATION if (down_interruptible(&Adapter->ReassocSem)) { - PRINTM(FATAL, "Acquire semaphore error, wlan_set_scan\n"); + PRINTM(FATAL, "Acquire semaphore error, libertas_set_scan\n"); return -EBUSY; } #endif @@ -1566,7 +1566,7 @@ int wlan_set_scan(struct net_device *dev * * @return WLAN_STATUS_SUCCESS-success, otherwise fail */ -int SendSpecificSSIDScan(wlan_private * priv, +int libertas_send_specific_SSID_scan(wlan_private * priv, struct WLAN_802_11_SSID *pRequestedSSID, u8 keepPreviousScan) { @@ -1603,7 +1603,7 @@ int SendSpecificSSIDScan(wlan_private * * * @return WLAN_STATUS_SUCCESS-success, otherwise fail */ -int SendSpecificBSSIDScan(wlan_private * priv, u8 * bssid, u8 keepPreviousScan) +int libertas_send_specific_BSSID_scan(wlan_private * priv, u8 * bssid, u8 keepPreviousScan) { struct wlan_ioctl_user_scan_cfg scanCfg; @@ -1633,7 +1633,7 @@ int SendSpecificBSSIDScan(wlan_private * * * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlan_get_scan(struct net_device *dev, struct iw_request_info *info, +int libertas_get_scan(struct net_device *dev, struct iw_request_info *info, struct iw_point *dwrq, char *extra) { wlan_private *priv = dev->priv; @@ -1683,7 +1683,7 @@ int wlan_get_scan(struct net_device *dev PRINTM(INFO, "i=%d Ssid: %32s\n", i, pScanTable->Ssid.Ssid); cfp = - find_cfp_by_band_and_channel(Adapter, 0, + libertas_find_cfp_by_band_and_channel(Adapter, 0, pScanTable->Channel); if (!cfp) { PRINTM(INFO, "Invalid channel number %d\n", @@ -1756,7 +1756,7 @@ int wlan_get_scan(struct net_device *dev CAL_NF(Adapter->NF[TYPE_BEACON][TYPE_NOAVG]); } if ((Adapter->InfrastructureMode == Wlan802_11IBSS) && - !SSIDcmp(&Adapter->CurBssParams.ssid, + !libertas_SSID_cmp(&Adapter->CurBssParams.ssid, &Adapter->ScanTable[i].Ssid) && Adapter->AdhocCreate) { ret = PrepareAndSendCommand(priv, @@ -1799,20 +1799,20 @@ int wlan_get_scan(struct net_device *dev iwe.u.bitrate.value = 0; /* Bit rate given in 500 kb/s units (+ 0x80) */ - for (j = 0; j < sizeof(Adapter->ScanTable[i].SupportedRates); + for (j = 0; j < sizeof(Adapter->ScanTable[i].libertas_supported_rates); j++) { - if (Adapter->ScanTable[i].SupportedRates[j] == 0) { + if (Adapter->ScanTable[i].libertas_supported_rates[j] == 0) { break; } rate = - (Adapter->ScanTable[i].SupportedRates[j] & 0x7F) * + (Adapter->ScanTable[i].libertas_supported_rates[j] & 0x7F) * 500000; if (rate > iwe.u.bitrate.value) { iwe.u.bitrate.value = rate; } iwe.u.bitrate.value = - (Adapter->ScanTable[i].SupportedRates[j] + (Adapter->ScanTable[i].libertas_supported_rates[j] & 0x7f) * 500000; iwe.len = IW_EV_PARAM_LEN; current_ev = @@ -1821,7 +1821,7 @@ int wlan_get_scan(struct net_device *dev } if ((Adapter->ScanTable[i].InfrastructureMode == Wlan802_11IBSS) - && !SSIDcmp(&Adapter->CurBssParams.ssid, + && !libertas_SSID_cmp(&Adapter->CurBssParams.ssid, &Adapter->ScanTable[i].Ssid) && Adapter->AdhocCreate) { iwe.u.bitrate.value = 22 * 500000; @@ -1906,7 +1906,7 @@ int wlan_get_scan(struct net_device *dev * * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlan_get_scan_table_ioctl(wlan_private * priv, struct iwreq *wrq) +int libertas_get_scan_table_ioctl(wlan_private * priv, struct iwreq *wrq) { wlan_adapter *Adapter; struct bss_descriptor *pBssInfo; @@ -2048,7 +2048,7 @@ int wlan_get_scan_table_ioctl(wlan_priva * * @return 0 if successful; IOCTL error code otherwise */ -int wlan_set_user_scan_ioctl(wlan_private * priv, struct iwreq *wrq) +int libertas_set_user_scan_ioctl(wlan_private * priv, struct iwreq *wrq) { struct wlan_ioctl_user_scan_cfg scanReq; int retcode; @@ -2092,7 +2092,7 @@ int wlan_set_user_scan_ioctl(wlan_privat * * @sa wlan_scan_create_channel_list */ -int wlan_cmd_802_11_scan(wlan_private * priv, +int libertas_cmd_80211_scan(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf) { struct HostCmd_DS_802_11_SCAN *pScan = &cmd->params.scan; @@ -2144,7 +2144,7 @@ int wlan_cmd_802_11_scan(wlan_private * * * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE */ -int wlan_ret_802_11_scan(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) +int libertas_ret_80211_scan(wlan_private * priv, struct HostCmd_DS_COMMAND *resp) { wlan_adapter *Adapter = priv->adapter; struct HostCmd_DS_802_11_SCAN_RSP *pScan; @@ -2314,7 +2314,7 @@ int wlan_ret_802_11_scan(wlan_private * * * @return WLAN_STATUS_SUCCESS --success, otherwise fail */ -int wlan_extscan_ioctl(wlan_private * priv, struct ifreq *req) +int libertas_extscan_ioctl(wlan_private * priv, struct ifreq *req) { struct WLAN_802_11_SSID Ext_Scan_SSID; union iwreq_data wrqu; @@ -2327,7 +2327,7 @@ int wlan_extscan_ioctl(wlan_private * pr LEAVE(); return -EFAULT; } - SendSpecificSSIDScan(priv, &Ext_Scan_SSID, 1); + libertas_send_specific_SSID_scan(priv, &Ext_Scan_SSID, 1); memset(&wrqu, 0, sizeof(union iwreq_data)); wireless_send_event(priv->wlan_dev.netdev, SIOCGIWSCAN, &wrqu, NULL); Index: linus-2.6/drivers/net/wireless/libertas/wlan_scan.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_scan.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_scan.h @@ -58,7 +58,7 @@ Change Log: * @brief Structure used internally in the wlan driver to configure a scan. * * Sent to the command processing module to configure the firmware - * scan command prepared by wlan_cmd_802_11_scan. + * scan command prepared by libertas_cmd_80211_scan. * * @sa wlan_scan_networks * @@ -116,7 +116,7 @@ struct wlan_ioctl_user_scan_chan { * as a channel list (wlan_ioctl_user_scan_chan) for each scan period * desired. * - * @sa wlan_set_user_scan_ioctl + * @sa libertas_set_user_scan_ioctl */ struct wlan_ioctl_user_scan_cfg { @@ -178,7 +178,7 @@ struct wlan_ioctl_get_scan_table_fixed { * @brief Structure passed in the wlan_ioctl_get_scan_table_info for each * BSS returned in the WLAN_GET_SCAN_RESP IOCTL * - * @sa wlan_get_scan_table_ioctl + * @sa libertas_get_scan_table_ioctl */ struct wlan_ioctl_get_scan_table_entry { @@ -218,7 +218,7 @@ struct wlan_ioctl_get_scan_table_entry { /** * @brief WLAN_GET_SCAN_RESP private IOCTL struct to retrieve the scan table * - * @sa wlan_get_scan_table_ioctl + * @sa libertas_get_scan_table_ioctl */ struct wlan_ioctl_get_scan_table_info { @@ -258,7 +258,7 @@ struct bss_descriptor { enum WLAN_802_11_NETWORK_TYPE NetworkTypeInUse; enum WLAN_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; - u8 SupportedRates[WLAN_SUPPORTED_RATES]; + u8 libertas_supported_rates[WLAN_SUPPORTED_RATES]; int extra_ie; @@ -277,42 +277,42 @@ struct bss_descriptor { }; -extern int SSIDcmp(struct WLAN_802_11_SSID *ssid1, +extern int libertas_SSID_cmp(struct WLAN_802_11_SSID *ssid1, struct WLAN_802_11_SSID *ssid2); -extern int FindSSIDInList(wlan_adapter * Adapter, struct WLAN_802_11_SSID *ssid, +extern int libertas_find_SSID_in_list(wlan_adapter * Adapter, struct WLAN_802_11_SSID *ssid, u8 * bssid, int mode); -extern int FindBestSSIDInList(wlan_adapter * Adapter); -extern int FindBSSIDInList(wlan_adapter * Adapter, u8 * bssid, int mode); +extern int libertas_find_best_SSID_in_list(wlan_adapter * Adapter); +extern int libertas_find_BSSID_in_list(wlan_adapter * Adapter, u8 * bssid, int mode); -extern int FindBestNetworkSsid(wlan_private * priv, +extern int libertas_find_best_network_SSID(wlan_private * priv, struct WLAN_802_11_SSID *pSSID); -extern int SendSpecificSSIDScan(wlan_private * priv, +extern int libertas_send_specific_SSID_scan(wlan_private * priv, struct WLAN_802_11_SSID *pRequestedSSID, u8 keepPreviousScan); -extern int SendSpecificBSSIDScan(wlan_private * priv, +extern int libertas_send_specific_BSSID_scan(wlan_private * priv, u8 * bssid, u8 keepPreviousScan); -extern int wlan_get_scan_table_ioctl(wlan_private * priv, struct iwreq *wrq); -extern int wlan_set_user_scan_ioctl(wlan_private * priv, struct iwreq *wrq); +extern int libertas_get_scan_table_ioctl(wlan_private * priv, struct iwreq *wrq); +extern int libertas_set_user_scan_ioctl(wlan_private * priv, struct iwreq *wrq); -extern int wlan_cmd_802_11_scan(wlan_private * priv, +extern int libertas_cmd_80211_scan(wlan_private * priv, struct HostCmd_DS_COMMAND *cmd, void *pdata_buf); -extern int wlan_ret_802_11_scan(wlan_private * priv, +extern int libertas_ret_80211_scan(wlan_private * priv, struct HostCmd_DS_COMMAND *resp); struct ifreq; -extern int wlan_extscan_ioctl(wlan_private * priv, struct ifreq *req); +extern int libertas_extscan_ioctl(wlan_private * priv, struct ifreq *req); #ifdef __KERNEL__ struct iw_point; struct iw_param; struct iw_request_info; -extern int wlan_get_scan(struct net_device *dev, struct iw_request_info *info, +extern int libertas_get_scan(struct net_device *dev, struct iw_request_info *info, struct iw_point *dwrq, char *extra); -extern int wlan_set_scan(struct net_device *dev, struct iw_request_info *info, +extern int libertas_set_scan(struct net_device *dev, struct iw_request_info *info, struct iw_param *vwrq, char *extra); #endif Index: linus-2.6/drivers/net/wireless/libertas/wlan_version.h =================================================================== --- linus-2.6.orig/drivers/net/wireless/libertas/wlan_version.h +++ linus-2.6/drivers/net/wireless/libertas/wlan_version.h @@ -29,7 +29,7 @@ Change log: #define FPNUM "14" -const char driver_version[] = "COMM-USB8388-%s-" DRIVER_RELEASE_VERSION +const char libertas_driver_version[] = "COMM-USB8388-%s-" DRIVER_RELEASE_VERSION #ifdef DEBUG_LEVEL2 "-dbg" #endif 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 @@ -21,9 +21,9 @@ /******************************************************** Change log: 10/10/05: Add Doxygen format comments - 12/23/05: Modify FindBSSIDInList to search entire table for + 12/23/05: Modify libertas_find_BSSID_in_list to search entire table for duplicate BSSIDs when earlier matches are not compatible - 12/26/05: Remove errant memcpy in wlanidle_off; overwriting stack space + 12/26/05: Remove errant memcpy in libertas_idle_off; overwriting stack space 01/05/06: Add kernel 2.6.x support 01/11/06: Change compile flag BULVERDE_SDIO to SD to support Monahans/Zylonite 01/11/06: Conditionalize new scan/join functions. @@ -177,7 +177,7 @@ static int mw_to_dbm(int mw) * @param channel the channel for looking * @return A pointer to struct chan_freq_power structure or NULL if not find. */ -struct chan_freq_power *find_cfp_by_band_and_channel(wlan_adapter * adapter, +struct chan_freq_power *libertas_find_cfp_by_band_and_channel(wlan_adapter * adapter, u8 band, u16 channel) { struct chan_freq_power *cfp = NULL; @@ -205,7 +205,7 @@ struct chan_freq_power *find_cfp_by_band } if (!cfp && channel) - PRINTM(INFO, "find_cfp_by_band_and_channel(): cannot find " + PRINTM(INFO, "libertas_find_cfp_by_band_and_channel(): cannot find " "cfp by band %d & channel %d\n", band, channel); return cfp; @@ -344,7 +344,7 @@ static int ChangeAdhocChannel(wlan_priva /* Exit Adhoc mode */ PRINTM(INFO, "In ChangeAdhocChannel(): Sending Adhoc Stop\n"); - ret = StopAdhocNetwork(priv); + ret = libertas_stop_adhoc_network(priv); if (ret) { LEAVE(); @@ -353,22 +353,22 @@ static int ChangeAdhocChannel(wlan_priva /* Scan for the network, do not save previous results. Stale * scan data will cause us to join a non-existant adhoc network */ - SendSpecificSSIDScan(priv, &curAdhocSsid, 0); + libertas_send_specific_SSID_scan(priv, &curAdhocSsid, 0); // find out the BSSID that matches the current SSID - i = FindSSIDInList(Adapter, &curAdhocSsid, NULL, + i = libertas_find_SSID_in_list(Adapter, &curAdhocSsid, NULL, Wlan802_11IBSS); if (i >= 0) { PRINTM(INFO, "SSID found at %d in List," "so join\n", i); - JoinAdhocNetwork(priv, &Adapter->ScanTable[i]); + libertas_join_adhoc_network(priv, &Adapter->ScanTable[i]); } else { // else send START command PRINTM(INFO, "SSID not found in list, " "so creating adhoc with ssid = %s\n", curAdhocSsid.Ssid); - StartAdhocNetwork(priv, &curAdhocSsid); + libertas_start_adhoc_network(priv, &curAdhocSsid); } // end of else (START command) } @@ -621,7 +621,7 @@ static int wlan_set_encode_nonwpa(struct * De-authenticate from AP */ - ret = SendDeauthentication(priv); + ret = libertas_send_deauthentication(priv); if (ret) { LEAVE(); @@ -846,7 +846,7 @@ static int wlan_set_region(wlan_private for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { // use the region code to search for the index - if (region_code == RegionCodeToIndex[i]) { + if (region_code == libertas_region_code_to_index[i]) { priv->adapter->RegionTableIndex = (u16) i; priv->adapter->RegionCode = region_code; break; @@ -908,13 +908,13 @@ static int get_active_data_rates(wlan_ad if (Adapter->InfrastructureMode == Wlan802_11Infrastructure) { //Infra. mode PRINTM(INFO, "Infra\n"); - k = CopyRates(rates, k, SupportedRates, - sizeof(SupportedRates)); + k = CopyRates(rates, k, libertas_supported_rates, + sizeof(libertas_supported_rates)); } else { //ad-hoc mode PRINTM(INFO, "Adhoc G\n"); - k = CopyRates(rates, k, AdhocRates_G, - sizeof(AdhocRates_G)); + k = CopyRates(rates, k, libertas_adhoc_rates_g, + sizeof(libertas_adhoc_rates_g)); } } else { k = CopyRates(rates, 0, Adapter->CurBssParams.DataRates, @@ -1043,11 +1043,11 @@ static int wlan_get_name(struct net_devi strcpy(cwrq, mrvl); - cp = strstr(driver_version, comm); - if (cp == driver_version) //skip leading "COMM-" - cp = driver_version + strlen(comm); + cp = strstr(libertas_driver_version, comm); + if (cp == libertas_driver_version) //skip leading "COMM-" + cp = libertas_driver_version + strlen(comm); else - cp = driver_version; + cp = libertas_driver_version; cnt = strlen(mrvl); cwrq += cnt; @@ -1080,7 +1080,7 @@ static int wlan_get_freq(struct net_devi ENTER(); - cfp = find_cfp_by_band_and_channel(Adapter, 0, + cfp = libertas_find_cfp_by_band_and_channel(Adapter, 0, Adapter->CurBssParams.channel); if (!cfp) { @@ -1973,13 +1973,13 @@ static const iw_handler wlan_handler[] = iw_handler_get_spy, /* SIOCGIWSPY */ iw_handler_set_thrspy, /* SIOCSIWTHRSPY */ iw_handler_get_thrspy, /* SIOCGIWTHRSPY */ - (iw_handler) wlan_set_wap, /* SIOCSIWAP */ + (iw_handler) libertas_set_wap, /* SIOCSIWAP */ (iw_handler) wlan_get_wap, /* SIOCGIWAP */ (iw_handler) NULL, /* -- hole -- */ //(iw_handler) wlan_get_aplist, /* SIOCGIWAPLIST */ NULL, /* SIOCGIWAPLIST */ - (iw_handler) wlan_set_scan, /* SIOCSIWSCAN */ - (iw_handler) wlan_get_scan, /* SIOCGIWSCAN */ + (iw_handler) libertas_set_scan, /* SIOCSIWSCAN */ + (iw_handler) libertas_get_scan, /* SIOCGIWSCAN */ (iw_handler) wlan_set_essid, /* SIOCSIWESSID */ (iw_handler) wlan_get_essid, /* SIOCGIWESSID */ (iw_handler) wlan_set_nick, /* SIOCSIWNICKN */ @@ -2466,7 +2466,7 @@ static const struct iw_priv_args wlan_pr "getscantable"}, }; -struct iw_handler_def wlan_handler_def = { +struct iw_handler_def libertas_handler_def = { .num_standard = sizeof(wlan_handler) / sizeof(iw_handler), .num_private = sizeof(wlan_private_handler) / sizeof(iw_handler), .num_private_args = sizeof(wlan_private_args) / @@ -3942,7 +3942,7 @@ int wlan_do_ioctl(struct net_device *dev PRINTM(INFO, "wlan_do_ioctl: ioctl cmd = 0x%x\n", cmd); switch (cmd) { case WLANEXTSCAN: - ret = wlan_extscan_ioctl(priv, req); + ret = libertas_extscan_ioctl(priv, req); break; case WLANHOSTCMD: ret = wlan_hostcmd_ioctl(dev, req, cmd); @@ -3969,12 +3969,12 @@ int wlan_do_ioctl(struct net_device *dev switch (wrq->u.data.flags) { case WLANDEAUTH: PRINTM(INFO, "Deauth\n"); - wlan_send_deauth(priv); + libertas_send_deauth(priv); break; case WLANADHOCSTOP: PRINTM(INFO, "Adhoc stop\n"); - ret = wlan_do_adhocstop_ioctl(priv); + ret = libertas_do_adhocstop_ioctl(priv); break; case WLANRADIOON: @@ -3993,10 +3993,10 @@ int wlan_do_ioctl(struct net_device *dev break; #endif /* REASSOCIATION */ case WLANWLANIDLEON: - wlanidle_on(priv); + libertas_idle_on(priv); break; case WLANWLANIDLEOFF: - wlanidle_off(priv); + libertas_idle_off(priv); break; case WLAN_SUBCMD_DFT_RESET: /* dft_reset */ wlan_dft_reset_ioctl(priv); @@ -4577,10 +4577,10 @@ int wlan_do_ioctl(struct net_device *dev case WLAN_SET_GET_2K: switch ((int)wrq->u.data.flags) { case WLAN_SET_USER_SCAN: - ret = wlan_set_user_scan_ioctl(priv, wrq); + ret = libertas_set_user_scan_ioctl(priv, wrq); break; case WLAN_GET_SCAN_TABLE: - ret = wlan_get_scan_table_ioctl(priv, wrq); + ret = libertas_get_scan_table_ioctl(priv, wrq); break; default: @@ -4766,7 +4766,7 @@ int wlan_set_freq(struct net_device *dev } else { int channel = fwrq->m; - cfp = find_cfp_by_band_and_channel(Adapter, 0, channel); + cfp = libertas_find_cfp_by_band_and_channel(Adapter, 0, channel); if (!cfp) { rc = -EINVAL; } else { @@ -4813,10 +4813,10 @@ int wlan_set_freq(struct net_device *dev */ u32 index_to_data_rate(u8 index) { - if (index >= sizeof(WlanDataRates)) + if (index >= sizeof(libertas_wlan_data_rates)) index = 0; - return WlanDataRates[index]; + return libertas_wlan_data_rates[index]; } /** @@ -4830,9 +4830,9 @@ u8 data_rate_to_index(u32 rate) u8 *ptr; if (rate) - if ((ptr = wlan_memchr(WlanDataRates, (u8) rate, - sizeof(WlanDataRates)))) - return (ptr - WlanDataRates); + if ((ptr = wlan_memchr(libertas_wlan_data_rates, (u8) rate, + sizeof(libertas_wlan_data_rates)))) + return (ptr - libertas_wlan_data_rates); return 0; } @@ -4991,7 +4991,7 @@ int wlan_set_mode(struct net_device *dev if (Adapter->MediaConnectStatus == WlanMediaStateConnected) { if (Adapter->InfrastructureMode == Wlan802_11Infrastructure) { - ret = SendDeauthentication(priv); + ret = libertas_send_deauthentication(priv); if (ret) { LEAVE(); @@ -4999,7 +4999,7 @@ int wlan_set_mode(struct net_device *dev } } else if (Adapter->InfrastructureMode == Wlan802_11IBSS) { /* If current mode is Adhoc, clean stale information */ - ret = StopAdhocNetwork(priv); + ret = libertas_stop_adhoc_network(priv); if (ret) { LEAVE(); @@ -5211,7 +5211,7 @@ void get_version(wlan_adapter * adapter, sprintf(fwver, "%u.%u.%u.p%u", ver.c[2], ver.c[1], ver.c[0], ver.c[3]); - snprintf(version, maxlen, driver_version, fwver); + snprintf(version, maxlen, libertas_driver_version, fwver); } static inline int hex2int(char c) 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 @@ -237,7 +237,7 @@ typedef struct _wlan_ioctl_adhoc_key_inf } wlan_ioctl_adhoc_key_info; #ifdef __KERNEL__ -extern struct iw_handler_def wlan_handler_def; +extern struct iw_handler_def libertas_handler_def; int wlan_do_ioctl(struct net_device *dev, struct ifreq *req, int i); #endif --