Skip to content

L
linux
Commit a71f0bf6 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files
Options

ath6kl: remove-typedef AR_SOFTC_T 

remove-typedef -s AR_SOFTC_T \
	"struct ar6_softc" drivers/staging/ath6kl/
Tested-by: default avatarNaveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b2bad087
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 293 additions and 293 deletions
drivers/staging/ath6kl/os/linux/ar6000_android.c
View file @ a71f0bf6
......@@ -334,7 +334,7 @@ void android_module_exit(void)
}
#ifdef CONFIG_PM
void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)
void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)
{
if (
#ifdef CONFIG_HAS_EARLYSUSPEND
......
drivers/staging/ath6kl/os/linux/ar6000_pm.c
View file @ a71f0bf6
......@@ -37,7 +37,7 @@ extern unsigned int wmitimeout;
extern wait_queue_head_t arEvent;
#ifdef ANDROID_ENV
extern void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent);
extern void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent);
#endif
#undef ATH_MODULE_NAME
#define ATH_MODULE_NAME pm
......@@ -57,10 +57,10 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(pm,
#endif /* DEBUG */
int ar6000_exit_cut_power_state(AR_SOFTC_T *ar);
int ar6000_exit_cut_power_state(struct ar6_softc *ar);
#ifdef CONFIG_PM
static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep)
static void ar6k_send_asleep_event_to_app(struct ar6_softc *ar, bool asleep)
{
char buf[128];
union iwreq_data wrqu;
......@@ -71,7 +71,7 @@ static void ar6k_send_asleep_event_to_app(AR_SOFTC_T *ar, bool asleep)
wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
}
static void ar6000_wow_resume(AR_SOFTC_T *ar)
static void ar6000_wow_resume(struct ar6_softc *ar)
{
if (ar->arWowState!= WLAN_WOW_STATE_NONE) {
u16 fg_start_period = (ar->scParams.fg_start_period==0) ? 1 : ar->scParams.fg_start_period;
......@@ -110,7 +110,7 @@ static void ar6000_wow_resume(AR_SOFTC_T *ar)
ar->arWlanPowerState = WLAN_POWER_STATE_ON;
}
static void ar6000_wow_suspend(AR_SOFTC_T *ar)
static void ar6000_wow_suspend(struct ar6_softc *ar)
{
#define WOW_LIST_ID 1
if (ar->arNetworkType != AP_NETWORK) {
......@@ -214,7 +214,7 @@ static void ar6000_wow_suspend(AR_SOFTC_T *ar)
int ar6000_suspend_ev(void *context)
{
int status = 0;
AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
struct ar6_softc *ar = (struct ar6_softc *)context;
s16 pmmode = ar->arSuspendConfig;
wow_not_connected:
switch (pmmode) {
......@@ -250,7 +250,7 @@ int ar6000_suspend_ev(void *context)
int ar6000_resume_ev(void *context)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
struct ar6_softc *ar = (struct ar6_softc *)context;
u16 powerState = ar->arWlanPowerState;
AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: enter previous state %d wowState %d\n", __func__, powerState, ar->arWowState));
......@@ -273,7 +273,7 @@ int ar6000_resume_ev(void *context)
return 0;
}
void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)
void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent)
{
if (ar->arWowState!=WLAN_WOW_STATE_NONE) {
if (ar->arWowState==WLAN_WOW_STATE_SUSPENDING) {
......@@ -292,7 +292,7 @@ void ar6000_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, bool isEvent)
int ar6000_power_change_ev(void *context, u32 config)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)context;
struct ar6_softc *ar = (struct ar6_softc *)context;
int status = 0;
AR_DEBUG_PRINTF(ATH_DEBUG_PM, ("%s: power change event callback %d \n", __func__, config));
......
drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
View file @ a71f0bf6
......@@ -28,7 +28,7 @@
static void
ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
struct ar6_softc *ar = (struct ar6_softc *)Context;
raw_htc_buffer *busy;
HTC_RAW_STREAM_ID streamID;
AR_RAW_HTC_T *arRaw = ar->arRawHtc;
......@@ -72,7 +72,7 @@ ar6000_htc_raw_read_cb(void *Context, struct htc_packet *pPacket)
static void
ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
struct ar6_softc *ar = (struct ar6_softc *)Context;
raw_htc_buffer *free;
HTC_RAW_STREAM_ID streamID;
AR_RAW_HTC_T *arRaw = ar->arRawHtc;
......@@ -111,7 +111,7 @@ ar6000_htc_raw_write_cb(void *Context, struct htc_packet *pPacket)
}
/* connect to a service */
static int ar6000_connect_raw_service(AR_SOFTC_T *ar,
static int ar6000_connect_raw_service(struct ar6_softc *ar,
HTC_RAW_STREAM_ID StreamID)
{
int status;
......@@ -166,7 +166,7 @@ static int ar6000_connect_raw_service(AR_SOFTC_T *ar,
return status;
}
int ar6000_htc_raw_open(AR_SOFTC_T *ar)
int ar6000_htc_raw_open(struct ar6_softc *ar)
{
int status;
int streamID, endPt, count2;
......@@ -272,7 +272,7 @@ int ar6000_htc_raw_open(AR_SOFTC_T *ar)
return 0;
}
int ar6000_htc_raw_close(AR_SOFTC_T *ar)
int ar6000_htc_raw_close(struct ar6_softc *ar)
{
A_PRINTF("ar6000_htc_raw_close called \n");
HTCStop(ar->arHtcTarget);
......@@ -286,7 +286,7 @@ int ar6000_htc_raw_close(AR_SOFTC_T *ar)
}
raw_htc_buffer *
get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
get_filled_buffer(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID)
{
int count;
raw_htc_buffer *busy;
......@@ -308,7 +308,7 @@ get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
return busy;
}
ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
ssize_t ar6000_htc_raw_read(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t length)
{
int readPtr;
......@@ -368,7 +368,7 @@ ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
}
static raw_htc_buffer *
get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
get_free_buffer(struct ar6_softc *ar, HTC_ENDPOINT_ID StreamID)
{
int count;
raw_htc_buffer *free;
......@@ -390,7 +390,7 @@ get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
return free;
}
ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
ssize_t ar6000_htc_raw_write(struct ar6_softc *ar, HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t length)
{
int writePtr;
......
drivers/staging/ath6kl/os/linux/ar6k_pal.c
View file @ a71f0bf6
......@@ -49,7 +49,7 @@ typedef struct ar6k_hci_pal_info_s{
#define HCI_NORMAL_MODE (1)
#define HCI_REGISTERED (1<<1)
struct hci_dev *hdev; /* BT Stack HCI dev */
AR_SOFTC_T *ar;
struct ar6_softc *ar;
}ar6k_hci_pal_info_t;
......@@ -122,7 +122,7 @@ static int btpal_send_frame(struct sk_buff *skb)
ar6k_hci_pal_info_t *pHciPalInfo;
int status = 0;
struct sk_buff *txSkb = NULL;
AR_SOFTC_T *ar;
struct ar6_softc *ar;
if (!hdev) {
PRIN_LOG("HCI PAL: btpal_send_frame - no device\n");
......@@ -313,7 +313,7 @@ static int bt_setup_hci_pal(ar6k_hci_pal_info_t *pHciPalInfo)
*********************************************/
void ar6k_cleanup_hci_pal(void *ar_p)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p;
struct ar6_softc *ar = (struct ar6_softc *)ar_p;
ar6k_hci_pal_info_t *pHciPalInfo = (ar6k_hci_pal_info_t *)ar->hcipal_info;
if (pHciPalInfo != NULL) {
......@@ -405,7 +405,7 @@ int ar6k_setup_hci_pal(void *ar_p)
int status = 0;
ar6k_hci_pal_info_t *pHciPalInfo;
ar6k_pal_config_t ar6k_pal_config;
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar_p;
struct ar6_softc *ar = (struct ar6_softc *)ar_p;
do {
......
drivers/staging/ath6kl/os/linux/cfg80211.c
View file @ a71f0bf6
......@@ -136,7 +136,7 @@ ieee80211_supported_band ar6k_band_5ghz = {
};
static int
ar6k_set_wpa_version(AR_SOFTC_T *ar, enum nl80211_wpa_versions wpa_version)
ar6k_set_wpa_version(struct ar6_softc *ar, enum nl80211_wpa_versions wpa_version)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: %u\n", __func__, wpa_version));
......@@ -157,7 +157,7 @@ ar6k_set_wpa_version(AR_SOFTC_T *ar, enum nl80211_wpa_versions wpa_version)
}
static int
ar6k_set_auth_type(AR_SOFTC_T *ar, enum nl80211_auth_type auth_type)
ar6k_set_auth_type(struct ar6_softc *ar, enum nl80211_auth_type auth_type)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: 0x%x\n", __func__, auth_type));
......@@ -183,7 +183,7 @@ ar6k_set_auth_type(AR_SOFTC_T *ar, enum nl80211_auth_type auth_type)
}
static int
ar6k_set_cipher(AR_SOFTC_T *ar, u32 cipher, bool ucast)
ar6k_set_cipher(struct ar6_softc *ar, u32 cipher, bool ucast)
{
u8 *ar_cipher = ucast ? &ar->arPairwiseCrypto :
&ar->arGroupCrypto;
......@@ -225,7 +225,7 @@ ar6k_set_cipher(AR_SOFTC_T *ar, u32 cipher, bool ucast)
}
static void
ar6k_set_key_mgmt(AR_SOFTC_T *ar, u32 key_mgmt)
ar6k_set_key_mgmt(struct ar6_softc *ar, u32 key_mgmt)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: 0x%x\n", __func__, key_mgmt));
......@@ -244,7 +244,7 @@ static int
ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_connect_params *sme)
{
AR_SOFTC_T *ar = ar6k_priv(dev);
struct ar6_softc *ar = ar6k_priv(dev);
int status;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
......@@ -429,7 +429,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
}
void
ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel,
u8 *bssid, u16 listenInterval,
u16 beaconInterval,NETWORK_TYPE networkType,
u8 beaconIeLen, u8 assocReqLen,
......@@ -581,7 +581,7 @@ static int
ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
u16 reason_code)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: reason=%u\n", __func__, reason_code));
......@@ -620,7 +620,7 @@ ar6k_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
}
void
ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason,
ar6k_cfg80211_disconnect_event(struct ar6_softc *ar, u8 reason,
u8 *bssid, u8 assocRespLen,
u8 *assocInfo, u16 protocolReasonStatus)
{
......@@ -736,7 +736,7 @@ static int
ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_scan_request *request)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
int ret = 0;
u32 forceFgScan = 0;
......@@ -792,7 +792,7 @@ ar6k_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
}
void
ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status)
ar6k_cfg80211_scanComplete_event(struct ar6_softc *ar, int status)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: status %d\n", __func__, status));
......@@ -823,7 +823,7 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index, bool pairwise, const u8 *mac_addr,
struct key_params *params)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
struct ar_key *key = NULL;
u8 key_usage;
u8 key_type;
......@@ -915,7 +915,7 @@ static int
ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index, bool pairwise, const u8 *mac_addr)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index));
......@@ -952,7 +952,7 @@ ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
void *cookie,
void (*callback)(void *cookie, struct key_params*))
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
struct ar_key *key = NULL;
struct key_params params;
......@@ -992,7 +992,7 @@ static int
ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index, bool unicast, bool multicast)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
struct ar_key *key = NULL;
int status = 0;
u8 key_usage;
......@@ -1044,7 +1044,7 @@ static int
ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(ndev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: index %d\n", __func__, key_index));
......@@ -1063,7 +1063,7 @@ ar6k_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev,
}
void
ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast)
ar6k_cfg80211_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast)
{
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
("%s: keyid %d, ismcast %d\n", __func__, keyid, ismcast));
......@@ -1076,7 +1076,7 @@ ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast)
static int
ar6k_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy);
struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: changed 0x%x\n", __func__, changed));
......@@ -1113,7 +1113,7 @@ ar6k_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
static int
ar6k_cfg80211_set_txpower(struct wiphy *wiphy, enum nl80211_tx_power_setting type, int dbm)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy);
struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
u8 ar_dbm;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type 0x%x, dbm %d\n", __func__, type, dbm));
......@@ -1149,7 +1149,7 @@ ar6k_cfg80211_set_txpower(struct wiphy *wiphy, enum nl80211_tx_power_setting typ
static int
ar6k_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)wiphy_priv(wiphy);
struct ar6_softc *ar = (struct ar6_softc *)wiphy_priv(wiphy);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
......@@ -1188,7 +1188,7 @@ ar6k_cfg80211_set_power_mgmt(struct wiphy *wiphy,
struct net_device *dev,
bool pmgmt, int timeout)
{
AR_SOFTC_T *ar = ar6k_priv(dev);
struct ar6_softc *ar = ar6k_priv(dev);
WMI_POWER_MODE_CMD pwrMode;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: pmgmt %d, timeout %d\n", __func__, pmgmt, timeout));
......@@ -1250,7 +1250,7 @@ ar6k_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
enum nl80211_iftype type, u32 *flags,
struct vif_params *params)
{
AR_SOFTC_T *ar = ar6k_priv(ndev);
struct ar6_softc *ar = ar6k_priv(ndev);
struct wireless_dev *wdev = ar->wdev;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: type %u\n", __func__, type));
......@@ -1286,7 +1286,7 @@ static int
ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_ibss_params *ibss_param)
{
AR_SOFTC_T *ar = ar6k_priv(dev);
struct ar6_softc *ar = ar6k_priv(dev);
int status;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
......@@ -1361,7 +1361,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
static int
ar6k_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
struct ar6_softc *ar = (struct ar6_softc *)ar6k_priv(dev);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: \n", __func__));
......@@ -1429,7 +1429,7 @@ ar6k_cfg80211_init(struct device *dev)
}
/* create a new wiphy for use with cfg80211 */
wdev->wiphy = wiphy_new(&ar6k_cfg80211_ops, sizeof(AR_SOFTC_T));
wdev->wiphy = wiphy_new(&ar6k_cfg80211_ops, sizeof(struct ar6_softc));
if(!wdev->wiphy) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
("%s: Couldn't allocate wiphy device\n", __func__));
......@@ -1463,7 +1463,7 @@ ar6k_cfg80211_init(struct device *dev)
}
void
ar6k_cfg80211_deinit(AR_SOFTC_T *ar)
ar6k_cfg80211_deinit(struct ar6_softc *ar)
{
struct wireless_dev *wdev = ar->wdev;
......
drivers/staging/ath6kl/os/linux/hci_bridge.c
View file @ a71f0bf6
......@@ -85,7 +85,7 @@ struct ar6k_hci_bridge_info {
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
struct hci_transport_misc_handles HCITransHdl;
#else
AR_SOFTC_T *ar;
struct ar6_softc *ar;
#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
};
......@@ -120,10 +120,10 @@ int ar6000_setup_hci(void *ar);
void ar6000_cleanup_hci(void *ar);
int hci_test_send(void *ar, struct sk_buff *skb);
#else
int ar6000_setup_hci(AR_SOFTC_T *ar);
void ar6000_cleanup_hci(AR_SOFTC_T *ar);
int ar6000_setup_hci(struct ar6_softc *ar);
void ar6000_cleanup_hci(struct ar6_softc *ar);
/* HCI bridge testing */
int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb);
int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb);
#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
#define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock)
......@@ -466,7 +466,7 @@ static HCI_SEND_FULL_ACTION ar6000_hci_pkt_send_full(void *pContext, struct htc
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int ar6000_setup_hci(void *ar)
#else
int ar6000_setup_hci(AR_SOFTC_T *ar)
int ar6000_setup_hci(struct ar6_softc *ar)
#endif
{
struct hci_transport_config_info config;
......@@ -563,7 +563,7 @@ int ar6000_setup_hci(AR_SOFTC_T *ar)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
void ar6000_cleanup_hci(void *ar)
#else
void ar6000_cleanup_hci(AR_SOFTC_T *ar)
void ar6000_cleanup_hci(struct ar6_softc *ar)
#endif
{
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
......@@ -598,7 +598,7 @@ void ar6000_cleanup_hci(AR_SOFTC_T *ar)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int hci_test_send(void *ar, struct sk_buff *skb)
#else
int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb)
#endif
{
int status = 0;
......@@ -664,7 +664,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
return status;
}
void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig)
{
struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info;
struct ar3k_config_info *config = (struct ar3k_config_info *)ar3kconfig;
......@@ -1080,7 +1080,7 @@ static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_b
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int ar6000_setup_hci(void *ar)
#else
int ar6000_setup_hci(AR_SOFTC_T *ar)
int ar6000_setup_hci(struct ar6_softc *ar)
#endif
{
return 0;
......@@ -1089,14 +1089,14 @@ int ar6000_setup_hci(AR_SOFTC_T *ar)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
void ar6000_cleanup_hci(void *ar)
#else
void ar6000_cleanup_hci(AR_SOFTC_T *ar)
void ar6000_cleanup_hci(struct ar6_softc *ar)
#endif
{
return;
}
#ifndef EXPORT_HCI_BRIDGE_INTERFACE
void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig)
{
return;
}
......@@ -1105,7 +1105,7 @@ void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int hci_test_send(void *ar, struct sk_buff *skb)
#else
int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb)
#endif
{
return -EOPNOTSUPP;
......
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
View file @ a71f0bf6
......@@ -466,7 +466,7 @@ typedef struct ar6_raw_htc {
bool read_buffer_available[HTC_RAW_STREAM_NUM_MAX];
} AR_RAW_HTC_T;
typedef struct ar6_softc {
struct ar6_softc {
struct net_device *arNetDev; /* net_device pointer */
void *arWmi;
int arTxPending[ENDPOINT_MAX];
......@@ -622,12 +622,12 @@ typedef struct ar6_softc {
#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
void *arApDev;
#endif
} AR_SOFTC_T;
};
#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
struct ar_virtual_interface {
struct net_device *arNetDev; /* net_device pointer */
AR_SOFTC_T *arDev; /* ar device pointer */
struct ar6_softc *arDev; /* ar device pointer */
struct net_device *arStaNetDev; /* net_device pointer */
};
#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */
......@@ -704,11 +704,11 @@ struct ar_giwscan_param {
int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
int ar6000_ioctl_dispatcher(struct net_device *dev, struct ifreq *rq, int cmd);
void ar6000_gpio_init(void);
void ar6000_init_profile_info(AR_SOFTC_T *ar);
void ar6000_install_static_wep_keys(AR_SOFTC_T *ar);
void ar6000_init_profile_info(struct ar6_softc *ar);
void ar6000_install_static_wep_keys(struct ar6_softc *ar);
int ar6000_init(struct net_device *dev);
int ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar);
void ar6000_TxDataCleanup(AR_SOFTC_T *ar);
int ar6000_dbglog_get_debug_logs(struct ar6_softc *ar);
void ar6000_TxDataCleanup(struct ar6_softc *ar);
int ar6000_acl_data_tx(struct sk_buff *skb, struct net_device *dev);
void ar6000_restart_endpoint(struct net_device *dev);
void ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs);
......@@ -719,12 +719,12 @@ void ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbgl
#define __user
#endif
int ar6000_htc_raw_open(AR_SOFTC_T *ar);
int ar6000_htc_raw_close(AR_SOFTC_T *ar);
ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar,
int ar6000_htc_raw_open(struct ar6_softc *ar);
int ar6000_htc_raw_close(struct ar6_softc *ar);
ssize_t ar6000_htc_raw_read(struct ar6_softc *ar,
HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t count);
ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
ssize_t ar6000_htc_raw_write(struct ar6_softc *ar,
HTC_RAW_STREAM_ID StreamID,
char __user *buffer, size_t count);
......@@ -733,22 +733,22 @@ ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
/* AP mode */
/*TODO: These routines should be moved to a file that is common across OS */
sta_t *
ieee80211_find_conn(AR_SOFTC_T *ar, u8 *node_addr);
ieee80211_find_conn(struct ar6_softc *ar, u8 *node_addr);
sta_t *
ieee80211_find_conn_for_aid(AR_SOFTC_T *ar, u8 aid);
ieee80211_find_conn_for_aid(struct ar6_softc *ar, u8 aid);
u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason);
u8 remove_sta(struct ar6_softc *ar, u8 *mac, u16 reason);
/* HCI support */
#ifndef EXPORT_HCI_BRIDGE_INTERFACE
int ar6000_setup_hci(AR_SOFTC_T *ar);
void ar6000_cleanup_hci(AR_SOFTC_T *ar);
void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig);
int ar6000_setup_hci(struct ar6_softc *ar);
void ar6000_cleanup_hci(struct ar6_softc *ar);
void ar6000_set_default_ar3kconfig(struct ar6_softc *ar, void *ar3kconfig);
/* HCI bridge testing */
int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb);
int hci_test_send(struct ar6_softc *ar, struct sk_buff *skb);
#endif
ATH_DEBUG_DECLARE_EXTERN(htc);
......
drivers/staging/ath6kl/os/linux/include/cfg80211.h
View file @ a71f0bf6
......@@ -25,21 +25,21 @@
#define _AR6K_CFG80211_H_
struct wireless_dev *ar6k_cfg80211_init(struct device *dev);
void ar6k_cfg80211_deinit(AR_SOFTC_T *ar);
void ar6k_cfg80211_deinit(struct ar6_softc *ar);
void ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status);
void ar6k_cfg80211_scanComplete_event(struct ar6_softc *ar, int status);
void ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
void ar6k_cfg80211_connect_event(struct ar6_softc *ar, u16 channel,
u8 *bssid, u16 listenInterval,
u16 beaconInterval,NETWORK_TYPE networkType,
u8 beaconIeLen, u8 assocReqLen,
u8 assocRespLen, u8 *assocInfo);
void ar6k_cfg80211_disconnect_event(AR_SOFTC_T *ar, u8 reason,
void ar6k_cfg80211_disconnect_event(struct ar6_softc *ar, u8 reason,
u8 *bssid, u8 assocRespLen,
u8 *assocInfo, u16 protocolReasonStatus);
void ar6k_cfg80211_tkip_micerr_event(AR_SOFTC_T *ar, u8 keyid, bool ismcast);
void ar6k_cfg80211_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast);
#endif /* _AR6K_CFG80211_H_ */
......
drivers/staging/ath6kl/os/linux/ioctl.c
View file @ a71f0bf6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7