libertas: move to uniform lbs_/LBS_ namespace
This patch unifies the namespace of variables, functions defines and structures. It does: - rename libertas_XXX to lbs_XXX - rename LIBERTAS_XXX to lbs_XXX - rename wlan_XXX to lbs_XXX - rename WLAN_XXX to LBS_XXX (but only those that were defined in libertas-local *.h files, e.g. not defines from net/ieee80211.h) While passing, I fixed some checkpatch.pl errors too. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Holger Schurig
committed by
David S. Miller
David S. Miller
parent
9a62f73b1a
commit
1007832103
@@ -2,10 +2,10 @@
|
||||
* Interface for the wlan network scan routines
|
||||
*
|
||||
* Driver interface functions and type declarations for the scan module
|
||||
* implemented in wlan_scan.c.
|
||||
* implemented in scan.c.
|
||||
*/
|
||||
#ifndef _WLAN_SCAN_H
|
||||
#define _WLAN_SCAN_H
|
||||
#ifndef _LBS_SCAN_H
|
||||
#define _LBS_SCAN_H
|
||||
|
||||
#include <net/ieee80211.h>
|
||||
#include "hostcmd.h"
|
||||
@@ -13,38 +13,38 @@
|
||||
/**
|
||||
* @brief Maximum number of channels that can be sent in a setuserscan ioctl
|
||||
*
|
||||
* @sa wlan_ioctl_user_scan_cfg
|
||||
* @sa lbs_ioctl_user_scan_cfg
|
||||
*/
|
||||
#define WLAN_IOCTL_USER_SCAN_CHAN_MAX 50
|
||||
#define LBS_IOCTL_USER_SCAN_CHAN_MAX 50
|
||||
|
||||
//! Infrastructure BSS scan type in wlan_scan_cmd_config
|
||||
#define WLAN_SCAN_BSS_TYPE_BSS 1
|
||||
//! Infrastructure BSS scan type in lbs_scan_cmd_config
|
||||
#define LBS_SCAN_BSS_TYPE_BSS 1
|
||||
|
||||
//! Adhoc BSS scan type in wlan_scan_cmd_config
|
||||
#define WLAN_SCAN_BSS_TYPE_IBSS 2
|
||||
//! Adhoc BSS scan type in lbs_scan_cmd_config
|
||||
#define LBS_SCAN_BSS_TYPE_IBSS 2
|
||||
|
||||
//! Adhoc or Infrastructure BSS scan type in wlan_scan_cmd_config, no filter
|
||||
#define WLAN_SCAN_BSS_TYPE_ANY 3
|
||||
//! Adhoc or Infrastructure BSS scan type in lbs_scan_cmd_config, no filter
|
||||
#define LBS_SCAN_BSS_TYPE_ANY 3
|
||||
|
||||
/**
|
||||
* @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 libertas_cmd_80211_scan.
|
||||
* scan command prepared by lbs_cmd_80211_scan.
|
||||
*
|
||||
* @sa wlan_scan_networks
|
||||
* @sa lbs_scan_networks
|
||||
*
|
||||
*/
|
||||
struct wlan_scan_cmd_config {
|
||||
struct lbs_scan_cmd_config {
|
||||
/**
|
||||
* @brief BSS type to be sent in the firmware command
|
||||
*
|
||||
* Field can be used to restrict the types of networks returned in the
|
||||
* scan. valid settings are:
|
||||
*
|
||||
* - WLAN_SCAN_BSS_TYPE_BSS (infrastructure)
|
||||
* - WLAN_SCAN_BSS_TYPE_IBSS (adhoc)
|
||||
* - WLAN_SCAN_BSS_TYPE_ANY (unrestricted, adhoc and infrastructure)
|
||||
* - LBS_SCAN_BSS_TYPE_BSS (infrastructure)
|
||||
* - LBS_SCAN_BSS_TYPE_IBSS (adhoc)
|
||||
* - LBS_SCAN_BSS_TYPE_ANY (unrestricted, adhoc and infrastructure)
|
||||
*/
|
||||
u8 bsstype;
|
||||
|
||||
@@ -68,12 +68,12 @@ struct wlan_scan_cmd_config {
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief IOCTL channel sub-structure sent in wlan_ioctl_user_scan_cfg
|
||||
* @brief IOCTL channel sub-structure sent in lbs_ioctl_user_scan_cfg
|
||||
*
|
||||
* Multiple instances of this structure are included in the IOCTL command
|
||||
* to configure a instance of a scan on the specific channel.
|
||||
*/
|
||||
struct wlan_ioctl_user_scan_chan {
|
||||
struct lbs_ioctl_user_scan_chan {
|
||||
u8 channumber; //!< channel Number to scan
|
||||
u8 radiotype; //!< Radio type: 'B/G' band = 0, 'A' band = 1
|
||||
u8 scantype; //!< Scan type: Active = 0, Passive = 1
|
||||
@@ -83,23 +83,23 @@ struct wlan_ioctl_user_scan_chan {
|
||||
/**
|
||||
* @brief IOCTL input structure to configure an immediate scan cmd to firmware
|
||||
*
|
||||
* Used in the setuserscan (WLAN_SET_USER_SCAN) private ioctl. Specifies
|
||||
* Used in the setuserscan (LBS_SET_USER_SCAN) private ioctl. Specifies
|
||||
* a number of parameters to be used in general for the scan as well
|
||||
* as a channel list (wlan_ioctl_user_scan_chan) for each scan period
|
||||
* as a channel list (lbs_ioctl_user_scan_chan) for each scan period
|
||||
* desired.
|
||||
*
|
||||
* @sa libertas_set_user_scan_ioctl
|
||||
* @sa lbs_set_user_scan_ioctl
|
||||
*/
|
||||
struct wlan_ioctl_user_scan_cfg {
|
||||
struct lbs_ioctl_user_scan_cfg {
|
||||
/**
|
||||
* @brief BSS type to be sent in the firmware command
|
||||
*
|
||||
* Field can be used to restrict the types of networks returned in the
|
||||
* scan. valid settings are:
|
||||
*
|
||||
* - WLAN_SCAN_BSS_TYPE_BSS (infrastructure)
|
||||
* - WLAN_SCAN_BSS_TYPE_IBSS (adhoc)
|
||||
* - WLAN_SCAN_BSS_TYPE_ANY (unrestricted, adhoc and infrastructure)
|
||||
* - LBS_SCAN_BSS_TYPE_BSS (infrastructure)
|
||||
* - LBS_SCAN_BSS_TYPE_IBSS (adhoc)
|
||||
* - LBS_SCAN_BSS_TYPE_ANY (unrestricted, adhoc and infrastructure)
|
||||
*/
|
||||
u8 bsstype;
|
||||
|
||||
@@ -128,7 +128,7 @@ struct wlan_ioctl_user_scan_cfg {
|
||||
/**
|
||||
* @brief Variable number (fixed maximum) of channels to scan up
|
||||
*/
|
||||
struct wlan_ioctl_user_scan_chan chanlist[WLAN_IOCTL_USER_SCAN_CHAN_MAX];
|
||||
struct lbs_ioctl_user_scan_chan chanlist[LBS_IOCTL_USER_SCAN_CHAN_MAX];
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -174,30 +174,30 @@ struct bss_descriptor {
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
int libertas_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
|
||||
int lbs_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
|
||||
|
||||
struct bss_descriptor * libertas_find_ssid_in_list(wlan_adapter * adapter,
|
||||
u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode,
|
||||
int channel);
|
||||
struct bss_descriptor *lbs_find_ssid_in_list(lbs_adapter *adapter,
|
||||
u8 *ssid, u8 ssid_len, u8 *bssid, u8 mode,
|
||||
int channel);
|
||||
|
||||
struct bss_descriptor * libertas_find_bssid_in_list(wlan_adapter * adapter,
|
||||
u8 * bssid, u8 mode);
|
||||
struct bss_descriptor *lbs_find_bssid_in_list(lbs_adapter *adapter,
|
||||
u8 *bssid, u8 mode);
|
||||
|
||||
int libertas_find_best_network_ssid(wlan_private * priv, u8 *out_ssid,
|
||||
int lbs_find_best_network_ssid(lbs_private *priv, u8 *out_ssid,
|
||||
u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode);
|
||||
|
||||
int libertas_send_specific_ssid_scan(wlan_private * priv, u8 *ssid,
|
||||
int lbs_send_specific_ssid_scan(lbs_private *priv, u8 *ssid,
|
||||
u8 ssid_len, u8 clear_ssid);
|
||||
|
||||
int libertas_cmd_80211_scan(wlan_private * priv,
|
||||
int lbs_cmd_80211_scan(lbs_private *priv,
|
||||
struct cmd_ds_command *cmd,
|
||||
void *pdata_buf);
|
||||
|
||||
int libertas_ret_80211_scan(wlan_private * priv,
|
||||
int lbs_ret_80211_scan(lbs_private *priv,
|
||||
struct cmd_ds_command *resp);
|
||||
|
||||
int wlan_scan_networks(wlan_private * priv,
|
||||
const struct wlan_ioctl_user_scan_cfg * puserscanin,
|
||||
int lbs_scan_networks(lbs_private *priv,
|
||||
const struct lbs_ioctl_user_scan_cfg *puserscanin,
|
||||
int full_scan);
|
||||
|
||||
struct ifreq;
|
||||
@@ -205,11 +205,11 @@ struct ifreq;
|
||||
struct iw_point;
|
||||
struct iw_param;
|
||||
struct iw_request_info;
|
||||
int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
|
||||
int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
|
||||
struct iw_point *dwrq, char *extra);
|
||||
int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
|
||||
int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
|
||||
struct iw_param *vwrq, char *extra);
|
||||
|
||||
void libertas_scan_worker(struct work_struct *work);
|
||||
void lbs_scan_worker(struct work_struct *work);
|
||||
|
||||
#endif /* _WLAN_SCAN_H */
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user