Skip to content

L
linux-davinci
Commit 69f9032d authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files
Options

libertas: remove arbitrary typedefs 

New typedefs are usually frowned upon. This patch changes
libertas_adapter -> struct libertas_adapter
libertas_priv -> struct libertas_priv

While passing, make everything checkpatch.pl-clean that gets touches.
Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 96287ac4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 606 additions and 565 deletions
drivers/net/wireless/libertas/11d.c
View file @ 69f9032d
......@@ -430,7 +430,7 @@ u8 lbs_get_scan_type_11d(u8 chan,
}
void lbs_init_11d(lbs_private * priv)
void lbs_init_11d(struct lbs_private *priv)
{
priv->adapter->enable11d = 0;
memset(&(priv->adapter->parsed_region_chan), 0,
......@@ -440,10 +440,10 @@ void lbs_init_11d(lbs_private * priv)
/**
* @brief This function sets DOMAIN INFO to FW
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @return 0; -1
*/
static int set_domain_info_11d(lbs_private * priv)
static int set_domain_info_11d(struct lbs_private *priv)
{
int ret;
......@@ -463,13 +463,13 @@ static int set_domain_info_11d(lbs_private * priv)
/**
* @brief This function setups scan channels
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @param band band
* @return 0
*/
int lbs_set_universaltable(lbs_private * priv, u8 band)
int lbs_set_universaltable(struct lbs_private *priv, u8 band)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
u16 size = sizeof(struct chan_freq_power);
u16 i = 0;
......@@ -492,20 +492,20 @@ int lbs_set_universaltable(lbs_private * priv, u8 band)
/**
* @brief This function implements command CMD_802_11D_DOMAIN_INFO
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @param cmd pointer to cmd buffer
* @param cmdno cmd ID
* @param cmdOption cmd action
* @return 0
*/
int lbs_cmd_802_11d_domain_info(lbs_private * priv,
int lbs_cmd_802_11d_domain_info(struct lbs_private *priv,
struct cmd_ds_command *cmd, u16 cmdno,
u16 cmdoption)
{
struct cmd_ds_802_11d_domain_info *pdomaininfo =
&cmd->params.domaininfo;
struct mrvlietypes_domainparamset *domain = &pdomaininfo->domain;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
u8 nr_subband = adapter->domainreg.nr_subband;
lbs_deb_enter(LBS_DEB_11D);
......@@ -552,11 +552,11 @@ done:
/**
* @brief This function parses countryinfo from AP and download country info to FW
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @param resp pointer to command response buffer
* @return 0; -1
*/
int lbs_ret_802_11d_domain_info(lbs_private * priv,
int lbs_ret_802_11d_domain_info(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;
......@@ -598,14 +598,14 @@ int lbs_ret_802_11d_domain_info(lbs_private * priv,
/**
* @brief This function parses countryinfo from AP and download country info to FW
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @return 0; -1
*/
int lbs_parse_dnld_countryinfo_11d(lbs_private * priv,
int lbs_parse_dnld_countryinfo_11d(struct lbs_private *priv,
struct bss_descriptor * bss)
{
int ret;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_11D);
if (priv->adapter->enable11d) {
......@@ -640,13 +640,13 @@ done:
/**
* @brief This function generates 11D info from user specified regioncode and download to FW
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @return 0; -1
*/
int lbs_create_dnld_countryinfo_11d(lbs_private * priv)
int lbs_create_dnld_countryinfo_11d(struct lbs_private *priv)
{
int ret;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct region_channel *region_chan;
u8 j;
......
drivers/net/wireless/libertas/11d.h
View file @ 69f9032d
......@@ -78,26 +78,28 @@ struct region_code_mapping {
u8 code;
};
struct lbs_private;
u8 lbs_get_scan_type_11d(u8 chan,
struct parsed_region_chan_11d *parsed_region_chan);
u32 lbs_chan_2_freq(u8 chan, u8 band);
void lbs_init_11d(lbs_private * priv);
void lbs_init_11d(struct lbs_private *priv);
int lbs_set_universaltable(lbs_private * priv, u8 band);
int lbs_set_universaltable(struct lbs_private *priv, u8 band);
int lbs_cmd_802_11d_domain_info(lbs_private * priv,
int lbs_cmd_802_11d_domain_info(struct lbs_private *priv,
struct cmd_ds_command *cmd, u16 cmdno,
u16 cmdOption);
int lbs_ret_802_11d_domain_info(lbs_private * priv,
int lbs_ret_802_11d_domain_info(struct lbs_private *priv,
struct cmd_ds_command *resp);
struct bss_descriptor;
int lbs_parse_dnld_countryinfo_11d(lbs_private * priv,
int lbs_parse_dnld_countryinfo_11d(struct lbs_private *priv,
struct bss_descriptor * bss);
int lbs_create_dnld_countryinfo_11d(lbs_private * priv);
int lbs_create_dnld_countryinfo_11d(struct lbs_private *priv);
#endif
drivers/net/wireless/libertas/assoc.c
View file @ 69f9032d
......@@ -15,10 +15,10 @@ static const u8 bssid_any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static int assoc_helper_essid(lbs_private *priv,
static int assoc_helper_essid(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
struct bss_descriptor * bss;
int channel = -1;
......@@ -75,10 +75,10 @@ static int assoc_helper_essid(lbs_private *priv,
}
static int assoc_helper_bssid(lbs_private *priv,
static int assoc_helper_bssid(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
struct bss_descriptor * bss;
DECLARE_MAC_BUF(mac);
......@@ -109,7 +109,7 @@ out:
}
static int assoc_helper_associate(lbs_private *priv,
static int assoc_helper_associate(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
int ret = 0, done = 0;
......@@ -135,10 +135,10 @@ static int assoc_helper_associate(lbs_private *priv,
}
static int assoc_helper_mode(lbs_private *priv,
static int assoc_helper_mode(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
lbs_deb_enter(LBS_DEB_ASSOC);
......@@ -165,7 +165,7 @@ done:
}
static int update_channel(lbs_private * priv)
static int update_channel(struct lbs_private *priv)
{
int ret;
/* the channel in f/w could be out of sync, get the current channel */
......@@ -179,7 +179,8 @@ static int update_channel(lbs_private * priv)
void lbs_sync_channel(struct work_struct *work)
{
lbs_private *priv = container_of(work, lbs_private, sync_channel);
struct lbs_private *priv = container_of(work, struct lbs_private,
sync_channel);
lbs_deb_enter(LBS_DEB_ASSOC);
if (update_channel(priv) != 0)
......@@ -187,10 +188,10 @@ void lbs_sync_channel(struct work_struct *work)
lbs_deb_leave(LBS_DEB_ASSOC);
}
static int assoc_helper_channel(lbs_private *priv,
static int assoc_helper_channel(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
lbs_deb_enter(LBS_DEB_ASSOC);
......@@ -242,10 +243,10 @@ done:
}
static int assoc_helper_wep_keys(lbs_private *priv,
static int assoc_helper_wep_keys(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int i;
int ret = 0;
......@@ -297,10 +298,10 @@ out:
return ret;
}
static int assoc_helper_secinfo(lbs_private *priv,
static int assoc_helper_secinfo(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
u32 do_wpa;
u32 rsn = 0;
......@@ -349,7 +350,7 @@ out:
}
static int assoc_helper_wpa_keys(lbs_private *priv,
static int assoc_helper_wpa_keys(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
int ret = 0;
......@@ -392,10 +393,10 @@ out:
}
static int assoc_helper_wpa_ie(lbs_private *priv,
static int assoc_helper_wpa_ie(struct lbs_private *priv,
struct assoc_request * assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
lbs_deb_enter(LBS_DEB_ASSOC);
......@@ -413,7 +414,7 @@ static int assoc_helper_wpa_ie(lbs_private *priv,
}
static int should_deauth_infrastructure(lbs_adapter *adapter,
static int should_deauth_infrastructure(struct lbs_adapter *adapter,
struct assoc_request * assoc_req)
{
int ret = 0;
......@@ -465,7 +466,7 @@ out:
}
static int should_stop_adhoc(lbs_adapter *adapter,
static int should_stop_adhoc(struct lbs_adapter *adapter,
struct assoc_request * assoc_req)
{
lbs_deb_enter(LBS_DEB_ASSOC);
......@@ -496,8 +497,9 @@ static int should_stop_adhoc(lbs_adapter *adapter,
void lbs_association_worker(struct work_struct *work)
{
lbs_private *priv = container_of(work, lbs_private, assoc_work.work);
lbs_adapter *adapter = priv->adapter;
struct lbs_private *priv = container_of(work, struct lbs_private,
assoc_work.work);
struct lbs_adapter *adapter = priv->adapter;
struct assoc_request * assoc_req = NULL;
int ret = 0;
int find_any_ssid = 0;
......@@ -684,7 +686,7 @@ done:
/*
* Caller MUST hold any necessary locks
*/
struct assoc_request *lbs_get_association_request(lbs_adapter *adapter)
struct assoc_request *lbs_get_association_request(struct lbs_adapter *adapter)
{
struct assoc_request * assoc_req;
......
drivers/net/wireless/libertas/assoc.h
View file @ 69f9032d
......@@ -6,9 +6,7 @@
#include "dev.h"
void lbs_association_worker(struct work_struct *work);
struct assoc_request * lbs_get_association_request(lbs_adapter *adapter);
struct assoc_request *lbs_get_association_request(struct lbs_adapter *adapter);
void lbs_sync_channel(struct work_struct *work);
#endif /* _LBS_ASSOC_H */
drivers/net/wireless/libertas/cmd.c
View file @ 69f9032d
This diff is collapsed.
drivers/net/wireless/libertas/cmdresp.c
View file @ 69f9032d
......@@ -20,12 +20,12 @@
* reports disconnect to upper layer, clean tx/rx packets,
* reset link state etc.
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @return n/a
*/
void lbs_mac_event_disconnected(lbs_private * priv)
void lbs_mac_event_disconnected(struct lbs_private *priv)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
union iwreq_data wrqu;
if (adapter->connect_status != LBS_CONNECTED)
......@@ -85,11 +85,11 @@ void lbs_mac_event_disconnected(lbs_private * priv)
/**
* @brief This function handles MIC failure event.
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @para event the event id
* @return n/a
*/
static void handle_mic_failureevent(lbs_private * priv, u32 event)
static void handle_mic_failureevent(struct lbs_private *priv, u32 event)
{
char buf[50];
......@@ -108,11 +108,11 @@ static void handle_mic_failureevent(lbs_private * priv, u32 event)
lbs_deb_leave(LBS_DEB_CMD);
}
static int lbs_ret_reg_access(lbs_private * priv,
static int lbs_ret_reg_access(struct lbs_private *priv,
u16 type, struct cmd_ds_command *resp)
{
int ret = 0;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -152,12 +152,12 @@ static int lbs_ret_reg_access(lbs_private * priv,
return ret;
}
static int lbs_ret_get_hw_spec(lbs_private * priv,
static int lbs_ret_get_hw_spec(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
u32 i;
struct cmd_ds_get_hw_spec *hwspec = &resp->params.hwspec;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
DECLARE_MAC_BUF(mac);
......@@ -216,11 +216,11 @@ done:
return ret;
}
static int lbs_ret_802_11_sleep_params(lbs_private * priv,
static int lbs_ret_802_11_sleep_params(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_sleep_params *sp = &resp->params.sleep_params;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -240,14 +240,14 @@ static int lbs_ret_802_11_sleep_params(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_stat(lbs_private * priv,
static int lbs_ret_802_11_stat(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
lbs_deb_enter(LBS_DEB_CMD);
/* currently adapter->wlan802_11Stat is unused
struct cmd_ds_802_11_get_stat *p11Stat = &resp->params.gstat;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
// TODO Convert it to Big endian befor copy
memcpy(&adapter->wlan802_11Stat,
......@@ -257,7 +257,7 @@ static int lbs_ret_802_11_stat(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_snmp_mib(lbs_private * priv,
static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_snmp_mib *smib = &resp->params.smib;
......@@ -299,12 +299,12 @@ static int lbs_ret_802_11_snmp_mib(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_key_material(lbs_private * priv,
static int lbs_ret_802_11_key_material(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_key_material *pkeymaterial =
&resp->params.keymaterial;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
u16 action = le16_to_cpu(pkeymaterial->action);
lbs_deb_enter(LBS_DEB_CMD);
......@@ -355,11 +355,11 @@ static int lbs_ret_802_11_key_material(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_mac_address(lbs_private * priv,
static int lbs_ret_802_11_mac_address(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_mac_address *macadd = &resp->params.macadd;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -369,11 +369,11 @@ static int lbs_ret_802_11_mac_address(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_rf_tx_power(lbs_private * priv,
static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_rf_tx_power *rtp = &resp->params.txp;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -385,11 +385,11 @@ static int lbs_ret_802_11_rf_tx_power(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_rate_adapt_rateset(lbs_private * priv,
static int lbs_ret_802_11_rate_adapt_rateset(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_rate_adapt_rateset *rates = &resp->params.rateset;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -402,11 +402,11 @@ static int lbs_ret_802_11_rate_adapt_rateset(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_data_rate(lbs_private * priv,
static int lbs_ret_802_11_data_rate(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_data_rate *pdatarate = &resp->params.drate;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -423,11 +423,11 @@ static int lbs_ret_802_11_data_rate(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_rf_channel(lbs_private * priv,
static int lbs_ret_802_11_rf_channel(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_rf_channel *rfchannel = &resp->params.rfchannel;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
u16 action = le16_to_cpu(rfchannel->action);
u16 newchannel = le16_to_cpu(rfchannel->currentchannel);
......@@ -446,11 +446,11 @@ static int lbs_ret_802_11_rf_channel(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_rssi(lbs_private * priv,
static int lbs_ret_802_11_rssi(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_rssi_rsp *rssirsp = &resp->params.rssirsp;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -477,10 +477,10 @@ static int lbs_ret_802_11_rssi(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_eeprom_access(lbs_private * priv,
static int lbs_ret_802_11_eeprom_access(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct lbs_ioctl_regrdwr *pbuf;
pbuf = (struct lbs_ioctl_regrdwr *) adapter->prdeeprom;
......@@ -503,11 +503,11 @@ static int lbs_ret_802_11_eeprom_access(lbs_private * priv,
return 0;
}
static int lbs_ret_get_log(lbs_private * priv,
static int lbs_ret_get_log(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_get_log *logmessage = &resp->params.glog;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -518,11 +518,11 @@ static int lbs_ret_get_log(lbs_private * priv,
return 0;
}
static int lbs_ret_802_11_enable_rsn(lbs_private * priv,
static int lbs_ret_802_11_enable_rsn(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11_enable_rsn *enable_rsn = &resp->params.enbrsn;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
u32 * pdata_buf = adapter->cur_cmd->pdata_buf;
lbs_deb_enter(LBS_DEB_CMD);
......@@ -556,11 +556,11 @@ static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
static inline int handle_cmd_response(u16 respcmd,
struct cmd_ds_command *resp,
lbs_private *priv)
struct lbs_private *priv)
{
int ret = 0;
unsigned long flags;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_HOST);
......@@ -735,11 +735,11 @@ static inline int handle_cmd_response(u16 respcmd,
return ret;
}
int lbs_process_rx_command(lbs_private * priv)
int lbs_process_rx_command(struct lbs_private *priv)
{
u16 respcmd;
struct cmd_ds_command *resp;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
ulong flags;
u16 result;
......@@ -888,10 +888,10 @@ done:
return ret;
}
int lbs_process_event(lbs_private * priv)
int lbs_process_event(struct lbs_private *priv)
{
int ret = 0;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
u32 eventcause;
lbs_deb_enter(LBS_DEB_CMD);
......
drivers/net/wireless/libertas/debugfs.c
View file @ 69f9032d
This diff is collapsed.
drivers/net/wireless/libertas/debugfs.h
View file @ 69f9032d
......@@ -4,7 +4,7 @@
void lbs_debugfs_init(void);
void lbs_debugfs_remove(void);
void lbs_debugfs_init_one(lbs_private *priv, struct net_device *dev);
void lbs_debugfs_remove_one(lbs_private *priv);
void lbs_debugfs_init_one(struct lbs_private *priv, struct net_device *dev);
void lbs_debugfs_remove_one(struct lbs_private *priv);
#endif
drivers/net/wireless/libertas/decl.h
View file @ 69f9032d
......@@ -12,71 +12,79 @@
/** Function Prototype Declaration */
struct lbs_private;
struct lbs_adapter;
struct sk_buff;
struct net_device;
int lbs_set_mac_packet_filter(lbs_private * priv);
int lbs_set_mac_packet_filter(struct lbs_private *priv);
void lbs_send_tx_feedback(lbs_private * priv);
void lbs_send_tx_feedback(struct lbs_private *priv);
int lbs_free_cmd_buffer(lbs_private * priv);
int lbs_free_cmd_buffer(struct lbs_private *priv);
struct cmd_ctrl_node;
struct cmd_ctrl_node *lbs_get_free_cmd_ctrl_node(lbs_private * priv);
struct cmd_ctrl_node *lbs_get_free_cmd_ctrl_node(struct lbs_private *priv);
void lbs_set_cmd_ctrl_node(lbs_private * priv,
struct cmd_ctrl_node *ptempnode,
u32 cmd_oid, u16 wait_option, void *pdata_buf);
void lbs_set_cmd_ctrl_node(struct lbs_private *priv,
struct cmd_ctrl_node *ptempnode,
u32 cmd_oid, u16 wait_option, void *pdata_buf);
int lbs_prepare_and_send_command(lbs_private * priv,
u16 cmd_no,
u16 cmd_action,
u16 wait_option, u32 cmd_oid, void *pdata_buf);
int lbs_prepare_and_send_command(struct lbs_private *priv,
u16 cmd_no,
u16 cmd_action,
u16 wait_option, u32 cmd_oid, void *pdata_buf);
void lbs_queue_cmd(lbs_adapter *adapter, struct cmd_ctrl_node *cmdnode, u8 addtail);
void lbs_queue_cmd(struct lbs_adapter *adapter,
struct cmd_ctrl_node *cmdnode,
u8 addtail);
int lbs_allocate_cmd_buffer(lbs_private * priv);
int lbs_execute_next_command(lbs_private * priv);
int lbs_process_event(lbs_private * priv);
int lbs_allocate_cmd_buffer(struct lbs_private *priv);
int lbs_execute_next_command(struct lbs_private *priv);
int lbs_process_event(struct lbs_private *priv);
void lbs_interrupt(struct net_device *);
int lbs_set_radio_control(lbs_private * priv);
int lbs_set_radio_control(struct lbs_private *priv);
u32 lbs_fw_index_to_data_rate(u8 index);
u8 lbs_data_rate_to_fw_index(u32 rate);
void lbs_get_fwversion(lbs_adapter *adapter, char *fwversion, int maxlen);
void lbs_get_fwversion(struct lbs_adapter *adapter,
char *fwversion,
int maxlen);
void lbs_upload_rx_packet(lbs_private * priv, struct sk_buff *skb);
void lbs_upload_rx_packet(struct lbs_private *priv, struct sk_buff *skb);
/** The proc fs interface */
int lbs_process_rx_command(lbs_private * priv);
int lbs_process_tx(lbs_private * priv, struct sk_buff *skb);
void __lbs_cleanup_and_insert_cmd(lbs_private * priv,
struct cmd_ctrl_node *ptempcmd);
int lbs_process_rx_command(struct lbs_private *priv);
int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb);
void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv,
struct cmd_ctrl_node *ptempcmd);
int lbs_set_regiontable(lbs_private * priv, u8 region, u8 band);
int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band);
int lbs_process_rxed_packet(lbs_private * priv, struct sk_buff *);
int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *);
void lbs_ps_sleep(lbs_private * priv, int wait_option);
void lbs_ps_confirm_sleep(lbs_private * priv, u16 psmode);
void lbs_ps_wakeup(lbs_private * priv, int wait_option);
void lbs_ps_sleep(struct lbs_private *priv, int wait_option);
void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode);
void lbs_ps_wakeup(struct lbs_private *priv, int wait_option);
void lbs_tx_runqueue(lbs_private *priv);
void lbs_tx_runqueue(struct lbs_private *priv);
struct chan_freq_power *lbs_find_cfp_by_band_and_channel(
lbs_adapter *adapter, u8 band, u16 channel);
struct lbs_adapter *adapter,
u8 band,
u16 channel);
void lbs_mac_event_disconnected(lbs_private * priv);
void lbs_mac_event_disconnected(struct lbs_private *priv);
void lbs_send_iwevcustom_event(lbs_private *priv, s8 *str);
void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str);
/* main.c */
struct chan_freq_power *lbs_get_region_cfp_table(u8 region, u8 band,
int *cfp_no);
lbs_private *lbs_add_card(void *card, struct device *dmdev);
int lbs_remove_card(lbs_private *priv);
int lbs_start_card(lbs_private *priv);
int lbs_stop_card(lbs_private *priv);
int lbs_add_mesh(lbs_private *priv, struct device *dev);
void lbs_remove_mesh(lbs_private *priv);
int lbs_reset_device(lbs_private *priv);
struct chan_freq_power *lbs_get_region_cfp_table(u8 region,
u8 band,
int *cfp_no);
struct lbs_private *lbs_add_card(void *card, struct device *dmdev);
int lbs_remove_card(struct lbs_private *priv);
int lbs_start_card(struct lbs_private *priv);
int lbs_stop_card(struct lbs_private *priv);
int lbs_add_mesh(struct lbs_private *priv, struct device *dev);
void lbs_remove_mesh(struct lbs_private *priv);
int lbs_reset_device(struct lbs_private *priv);
#endif
drivers/net/wireless/libertas/defs.h
View file @ 69f9032d
......@@ -262,8 +262,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
#define UNSET_MESH_FRAME(x) (x->cb[6]=0)
/** Global Variable Declaration */
typedef struct _lbs_private lbs_private;
typedef struct _lbs_adapter lbs_adapter;
extern const char lbs_driver_version[];
extern u16 lbs_region_code_to_index[MRVDRV_MAX_REGION_CODE];
......
drivers/net/wireless/libertas/dev.h
View file @ 69f9032d
/**
* This file contains definitions and data structures specific
* to Marvell 802.11 NIC. It contains the Device Information
* structure lbs_adapter.
* structure struct lbs_adapter.
*/
#ifndef _LBS_DEV_H_
#define _LBS_DEV_H_
......@@ -99,7 +99,7 @@ struct lbs_mesh_stats {
};
/** Private structure for the MV device */
struct _lbs_private {
struct lbs_private {
int open;
int mesh_open;
int infra_open;
......@@ -109,7 +109,7 @@ struct _lbs_private {
char name[DEV_NAME_LEN];
void *card;
lbs_adapter *adapter;
struct lbs_adapter *adapter;
struct net_device *dev;
struct net_device_stats stats;
......@@ -155,9 +155,9 @@ struct _lbs_private {
struct work_struct sync_channel;
/** Hardware access */
int (*hw_host_to_card) (lbs_private *priv, u8 type, u8 *payload, u16 nb);
int (*hw_get_int_status) (lbs_private *priv, u8 *);
int (*hw_read_event_cause) (lbs_private *);
int (*hw_host_to_card) (struct lbs_private *priv, u8 type, u8 *payload, u16 nb);
int (*hw_get_int_status) (struct lbs_private *priv, u8 *);
int (*hw_read_event_cause) (struct lbs_private *);
};
/** Association request
......@@ -205,7 +205,7 @@ struct assoc_request {
};
/** Wlan adapter data structure*/
struct _lbs_adapter {
struct lbs_adapter {
/** STATUS variables */
u8 fwreleasenumber[4];
u32 fwcapinfo;
......
drivers/net/wireless/libertas/ethtool.c
View file @ 69f9032d
......@@ -22,7 +22,7 @@ static const char * mesh_stat_strings[]= {
static void lbs_ethtool_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
lbs_private *priv = (lbs_private *) dev->priv;
struct lbs_private *priv = (struct lbs_private *) dev->priv;
char fwver[32];
lbs_get_fwversion(priv->adapter, fwver, sizeof(fwver) - 1);
......@@ -45,8 +45,8 @@ static int lbs_ethtool_get_eeprom_len(struct net_device *dev)
static int lbs_ethtool_get_eeprom(struct net_device *dev,
struct ethtool_eeprom *eeprom, u8 * bytes)
{
lbs_private *priv = (lbs_private *) dev->priv;
lbs_adapter *adapter = priv->adapter;
struct lbs_private *priv = (struct lbs_private *) dev->priv;
struct lbs_adapter *adapter = priv->adapter;
struct lbs_ioctl_regrdwr regctrl;
char *ptr;
int ret;
......@@ -108,7 +108,7 @@ done:
static void lbs_ethtool_get_stats(struct net_device * dev,
struct ethtool_stats * stats, u64 * data)
{
lbs_private *priv = dev->priv;
struct lbs_private *priv = dev->priv;
struct cmd_ds_mesh_access mesh_access;
int ret;
......
drivers/net/wireless/libertas/if_cs.c
View file @ 69f9032d
......@@ -57,7 +57,7 @@ MODULE_LICENSE("GPL");
struct if_cs_card {
struct pcmcia_device *p_dev;
lbs_private *priv;
struct lbs_private *priv;
void __iomem *iobase;
};
......@@ -286,7 +286,7 @@ static irqreturn_t if_cs_interrupt(int irq, void *data)
/*
* Called from if_cs_host_to_card to send a command to the hardware
*/
static int if_cs_send_cmd(lbs_private *priv, u8 *buf, u16 nb)
static int if_cs_send_cmd(struct lbs_private *priv, u8 *buf, u16 nb)
{
struct if_cs_card *card = (struct if_cs_card *)priv->card;
int ret = -1;
......@@ -331,7 +331,7 @@ done:
/*
* Called from if_cs_host_to_card to send a data to the hardware
*/
static void if_cs_send_data(lbs_private *priv, u8 *buf, u16 nb)
static void if_cs_send_data(struct lbs_private *priv, u8 *buf, u16 nb)
{
struct if_cs_card *card = (struct if_cs_card *)priv->card;
......@@ -354,7 +354,7 @@ static void if_cs_send_data(lbs_private *priv, u8 *buf, u16 nb)
/*
* Get the command result out of the card.
*/
static int if_cs_receive_cmdres(lbs_private *priv, u8 *data, u32 *len)
static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len)
{
int ret = -1;
u16 val;
......@@ -386,7 +386,7 @@ out:
}
static struct sk_buff *if_cs_receive_data(lbs_private *priv)
static struct sk_buff *if_cs_receive_data(struct lbs_private *priv)
{
struct sk_buff *skb = NULL;
u16 len;
......@@ -616,7 +616,10 @@ done:
/********************************************************************/
/* Send commands or data packets to the card */
static int if_cs_host_to_card(lbs_private *priv, u8 type, u8 *buf, u16 nb)
static int if_cs_host_to_card(struct lbs_private *priv,
u8 type,
u8 *buf,
u16 nb)
{
int ret = -1;
......@@ -641,10 +644,10 @@ static int if_cs_host_to_card(lbs_private *priv, u8 type, u8 *buf, u16 nb)
}
static int if_cs_get_int_status(lbs_private *priv, u8 *ireg)
static int if_cs_get_int_status(struct lbs_private *priv, u8 *ireg)
{
struct if_cs_card *card = (struct if_cs_card *)priv->card;
/* lbs_adapter *adapter = priv->adapter; */
/* struct lbs_adapter *adapter = priv->adapter; */
int ret = 0;
u16 int_cause;
u8 *cmdbuf;
......@@ -698,7 +701,7 @@ out:
}
static int if_cs_read_event_cause(lbs_private *priv)
static int if_cs_read_event_cause(struct lbs_private *priv)
{
lbs_deb_enter(LBS_DEB_CS);
......@@ -746,7 +749,7 @@ static void if_cs_release(struct pcmcia_device *p_dev)
static int if_cs_probe(struct pcmcia_device *p_dev)
{
int ret = -ENOMEM;
lbs_private *priv;
struct lbs_private *priv;
struct if_cs_card *card;
/* CIS parsing */
tuple_t tuple;
......
drivers/net/wireless/libertas/if_sdio.c
View file @ 69f9032d
......@@ -82,7 +82,7 @@ struct if_sdio_packet {
struct if_sdio_card {
struct sdio_func *func;
lbs_private *priv;
struct lbs_private *priv;
int model;
unsigned long ioport;
......@@ -694,7 +694,8 @@ out:
/* Libertas callbacks */
/*******************************************************************/
static int if_sdio_host_to_card(lbs_private *priv, u8 type, u8 *buf, u16 nb)
static int if_sdio_host_to_card(struct lbs_private *priv,
u8 type, u8 *buf, u16 nb)
{
int ret;
struct if_sdio_card *card;
......@@ -775,7 +776,7 @@ out:
return ret;
}
static int if_sdio_get_int_status(lbs_private *priv, u8 *ireg)
static int if_sdio_get_int_status(struct lbs_private *priv, u8 *ireg)
{
struct if_sdio_card *card;
......@@ -791,7 +792,7 @@ static int if_sdio_get_int_status(lbs_private *priv, u8 *ireg)
return 0;
}
static int if_sdio_read_event_cause(lbs_private *priv)
static int if_sdio_read_event_cause(struct lbs_private *priv)
{
struct if_sdio_card *card;
......@@ -857,7 +858,7 @@ static int if_sdio_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
struct if_sdio_card *card;
lbs_private *priv;
struct lbs_private *priv;
int ret, i;
unsigned int model;
struct if_sdio_packet *packet;
......
drivers/net/wireless/libertas/if_usb.c
View file @ 69f9032d
......@@ -32,9 +32,12 @@ MODULE_DEVICE_TABLE(usb, if_usb_table);
static void if_usb_receive(struct urb *urb);
static void if_usb_receive_fwload(struct urb *urb);
static int if_usb_prog_firmware(struct usb_card_rec *cardp);
static int if_usb_host_to_card(lbs_private *priv, u8 type, u8 *payload, u16 nb);
static int if_usb_get_int_status(lbs_private *priv, u8 *);
static int if_usb_read_event_cause(lbs_private *);
static int if_usb_host_to_card(struct lbs_private *priv,
u8 type,
u8 *payload,
u16 nb);
static int if_usb_get_int_status(struct lbs_private *priv, u8 *);
static int if_usb_read_event_cause(struct lbs_private *);
static int usb_tx_block(struct usb_card_rec *cardp, u8 *payload, u16 nb);
static void if_usb_free(struct usb_card_rec *cardp);
static int if_usb_submit_rx_urb(struct usb_card_rec *cardp);
......@@ -52,7 +55,7 @@ static void if_usb_write_bulk_callback(struct urb *urb)
/* handle the transmission complete validations */
if (urb->status == 0) {
lbs_private *priv = cardp->priv;
struct lbs_private *priv = cardp->priv;
/*
lbs_deb_usbd(&urb->dev->dev, "URB status is successfull\n");
......@@ -64,7 +67,7 @@ static void if_usb_write_bulk_callback(struct urb *urb)
* valid at firmware load time.
*/
if (priv) {
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct net_device *dev = priv->dev;
priv->dnld_sent = DNLD_RES_RECEIVED;
......@@ -124,7 +127,7 @@ static int if_usb_probe(struct usb_interface *intf,
struct usb_device *udev;
struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint;
lbs_private *priv;
struct lbs_private *priv;
struct usb_card_rec *cardp;
int i;
......@@ -259,7 +262,7 @@ error:
static void if_usb_disconnect(struct usb_interface *intf)
{
struct usb_card_rec *cardp = usb_get_intfdata(intf);
lbs_private *priv = (lbs_private *) cardp->priv;
struct lbs_private *priv = (struct lbs_private *) cardp->priv;
lbs_deb_enter(LBS_DEB_MAIN);
......@@ -267,7 +270,7 @@ static void if_usb_disconnect(struct usb_interface *intf)
cardp->surprise_removed = 1;
if (priv) {
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
adapter->surpriseremoved = 1;
lbs_stop_card(priv);
......@@ -290,7 +293,7 @@ static void if_usb_disconnect(struct usb_interface *intf)
/**
* @brief This function download FW
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @return 0
*/
static int if_prog_firmware(struct usb_card_rec *cardp)
......@@ -373,7 +376,7 @@ static int if_prog_firmware(struct usb_card_rec *cardp)
static int if_usb_reset_device(struct usb_card_rec *cardp)
{
int ret;
lbs_private * priv = cardp->priv;
struct lbs_private *priv = cardp->priv;
lbs_deb_enter(LBS_DEB_USB);
......@@ -394,7 +397,7 @@ static int if_usb_reset_device(struct usb_card_rec *cardp)
/**
* @brief This function transfer the data to the device.
* @param priv pointer to lbs_private
* @param priv pointer to struct lbs_private
* @param payload pointer to payload data
* @param nb data length
* @return 0 or -1
......@@ -571,7 +574,7 @@ exit:
static inline void process_cmdtypedata(int recvlength, struct sk_buff *skb,
struct usb_card_rec *cardp,
lbs_private *priv)
struct lbs_private *priv)
{
if (recvlength > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE +
MESSAGE_HEADER_LEN || recvlength < MRVDRV_MIN_PKT_LEN) {
......@@ -591,7 +594,7 @@ static inline void process_cmdtypedata(int recvlength, struct sk_buff *skb,
static inline void process_cmdrequest(int recvlength, u8 *recvbuff,
struct sk_buff *skb,
struct usb_card_rec *cardp,
lbs_private *priv)
struct lbs_private *priv)
{
u8 *cmdbuf;
if (recvlength > MRVDRV_SIZE_OF_CMD_BUFFER) {
......@@ -640,7 +643,7 @@ static void if_usb_receive(struct urb *urb)
struct read_cb_info *rinfo = (struct read_cb_info *)urb->context;
struct sk_buff *skb = rinfo->skb;
struct usb_card_rec *cardp = (struct usb_card_rec *) rinfo->cardp;
lbs_private * priv = cardp->priv;
struct lbs_private *priv = cardp->priv;
int recvlength = urb->actual_length;
u8 *recvbuff = NULL;
......@@ -708,13 +711,16 @@ rx_exit:
/**
* @brief This function downloads data to FW
* @param priv pointer to lbs_private structure
* @param priv pointer to struct lbs_private structure
* @param type type of data
* @param buf pointer to data buffer
* @param len number of bytes
* @return 0 or -1
*/
static int if_usb_host_to_card(lbs_private *priv, u8 type, u8 *payload, u16 nb)
static int if_usb_host_to_card(struct lbs_private *priv,
u8 type,
u8 *payload,
u16 nb)
{
struct usb_card_rec *cardp = (struct usb_card_rec *)priv->card;
......@@ -741,7 +747,7 @@ static int if_usb_host_to_card(lbs_private *priv, u8 type, u8 *payload, u16 nb)
}
/* called with adapter->driver_lock held */
static int if_usb_get_int_status(lbs_private *priv, u8 *ireg)
static int if_usb_get_int_status(struct lbs_private *priv, u8 *ireg)
{
struct usb_card_rec *cardp = priv->card;
......@@ -753,7 +759,7 @@ static int if_usb_get_int_status(lbs_private *priv, u8 *ireg)
return 0;
}
static int if_usb_read_event_cause(lbs_private * priv)
static int if_usb_read_event_cause(struct lbs_private *priv)
{
struct usb_card_rec *cardp = priv->card;
......@@ -928,7 +934,7 @@ done:
static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
{
struct usb_card_rec *cardp = usb_get_intfdata(intf);
lbs_private *priv = cardp->priv;
struct lbs_private *priv = cardp->priv;
lbs_deb_enter(LBS_DEB_USB);
......@@ -964,7 +970,7 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
static int if_usb_resume(struct usb_interface *intf)
{
struct usb_card_rec *cardp = usb_get_intfdata(intf);
lbs_private *priv = cardp->priv;
struct lbs_private *priv = cardp->priv;
lbs_deb_enter(LBS_DEB_USB);
......
drivers/net/wireless/libertas/join.c
View file @ 69f9032d
......@@ -30,13 +30,15 @@
* NOTE: Setting the MSB of the basic rates need to be taken
* care, either before or after calling this function
*
* @param adapter A pointer to lbs_adapter structure
* @param adapter A pointer to struct lbs_adapter structure
* @param rate1 the buffer which keeps input and output
* @param rate1_size the size of rate1 buffer; new size of buffer on return
*
* @return 0 or -1
*/
static int get_common_rates(lbs_adapter *adapter, u8 *rates, u16 *rates_size)
static int get_common_rates(struct lbs_adapter *adapter,
u8 *rates,
u16 *rates_size)
{
u8 *card_rates = lbs_bg_rates;
size_t num_card_rates = sizeof(lbs_bg_rates);
......@@ -116,14 +118,14 @@ void lbs_unset_basic_rate_flags(u8 *rates, size_t len)
/**
* @brief Associate to a specific BSS discovered in a scan
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param pbssdesc Pointer to the BSS descriptor to associate with.
*
* @return 0-success, otherwise fail
*/
int lbs_associate(lbs_private *priv, struct assoc_request *assoc_req)
int lbs_associate(struct lbs_private *priv, struct assoc_request *assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret;
lbs_deb_enter(LBS_DEB_JOIN);
......@@ -155,13 +157,14 @@ done:
/**
* @brief Start an Adhoc Network
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param adhocssid The ssid of the Adhoc Network
* @return 0--success, -1--fail
*/
int lbs_start_adhoc_network(lbs_private *priv, struct assoc_request *assoc_req)
int lbs_start_adhoc_network(struct lbs_private *priv,
struct assoc_request *assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
adapter->adhoccreate = 1;
......@@ -188,15 +191,16 @@ int lbs_start_adhoc_network(lbs_private *priv, struct assoc_request *assoc_req)
/**
* @brief Join an adhoc network found in a previous scan
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param pbssdesc Pointer to a BSS descriptor found in a previous scan
* to attempt to join
*
* @return 0--success, -1--fail
*/
int lbs_join_adhoc_network(lbs_private *priv, struct assoc_request *assoc_req)
int lbs_join_adhoc_network(struct lbs_private *priv,
struct assoc_request *assoc_req)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct bss_descriptor * bss = &assoc_req->bss;
int ret = 0;
......@@ -258,7 +262,7 @@ out:
return ret;
}
int lbs_stop_adhoc_network(lbs_private * priv)
int lbs_stop_adhoc_network(struct lbs_private *priv)
{
return lbs_prepare_and_send_command(priv, CMD_802_11_AD_HOC_STOP,
0, CMD_OPTION_WAITFORRSP, 0, NULL);
......@@ -267,10 +271,10 @@ int lbs_stop_adhoc_network(lbs_private * priv)
/**
* @brief Send Deauthentication Request
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @return 0--success, -1--fail
*/
int lbs_send_deauthentication(lbs_private *priv)
int lbs_send_deauthentication(struct lbs_private *priv)
{
return lbs_prepare_and_send_command(priv, CMD_802_11_DEAUTHENTICATE,
0, CMD_OPTION_WAITFORRSP, 0, NULL);
......@@ -279,17 +283,17 @@ int lbs_send_deauthentication(lbs_private *priv)
/**
* @brief This function prepares command of authenticate.
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param cmd A pointer to cmd_ds_command structure
* @param pdata_buf Void cast of pointer to a BSSID to authenticate with
*
* @return 0 or -1
*/
int lbs_cmd_80211_authenticate(lbs_private *priv,
int lbs_cmd_80211_authenticate(struct lbs_private *priv,
struct cmd_ds_command *cmd,
void *pdata_buf)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth;
int ret = -1;
u8 *bssid = pdata_buf;
......@@ -329,10 +333,10 @@ out:
return ret;
}
int lbs_cmd_80211_deauthenticate(lbs_private *priv,
int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,
struct cmd_ds_command *cmd)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct cmd_ds_802_11_deauthenticate *dauth = &cmd->params.deauth;
lbs_deb_enter(LBS_DEB_JOIN);
......@@ -352,10 +356,10 @@ int lbs_cmd_80211_deauthenticate(lbs_private *priv,
return 0;
}
int lbs_cmd_80211_associate(lbs_private *priv,
int lbs_cmd_80211_associate(struct lbs_private *priv,
struct cmd_ds_command *cmd, void *pdata_buf)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct cmd_ds_802_11_associate *passo = &cmd->params.associate;
int ret = 0;
struct assoc_request * assoc_req = pdata_buf;
......@@ -468,10 +472,10 @@ done:
return ret;
}
int lbs_cmd_80211_ad_hoc_start(lbs_private *priv,
int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,
struct cmd_ds_command *cmd, void *pdata_buf)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct cmd_ds_802_11_ad_hoc_start *adhs = &cmd->params.ads;
int ret = 0;
int cmdappendsize = 0;
......@@ -582,7 +586,7 @@ done:
return ret;
}
int lbs_cmd_80211_ad_hoc_stop(lbs_private *priv,
int lbs_cmd_80211_ad_hoc_stop(struct lbs_private *priv,
struct cmd_ds_command *cmd)
{
cmd->command = cpu_to_le16(CMD_802_11_AD_HOC_STOP);
......@@ -591,10 +595,10 @@ int lbs_cmd_80211_ad_hoc_stop(lbs_private *priv,
return 0;
}
int lbs_cmd_80211_ad_hoc_join(lbs_private *priv,
int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,
struct cmd_ds_command *cmd, void *pdata_buf)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct cmd_ds_802_11_ad_hoc_join *join_cmd = &cmd->params.adj;
struct assoc_request * assoc_req = pdata_buf;
struct bss_descriptor *bss = &assoc_req->bss;
......@@ -694,10 +698,10 @@ done:
return ret;
}
int lbs_ret_80211_associate(lbs_private *priv,
int lbs_ret_80211_associate(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
union iwreq_data wrqu;
struct ieeetypes_assocrsp *passocrsp;
......@@ -807,7 +811,7 @@ done:
return ret;
}
int lbs_ret_80211_disassociate(lbs_private *priv,
int lbs_ret_80211_disassociate(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
lbs_deb_enter(LBS_DEB_JOIN);
......@@ -818,10 +822,10 @@ int lbs_ret_80211_disassociate(lbs_private *priv,
return 0;
}
int lbs_ret_80211_ad_hoc_start(lbs_private *priv,
int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
u16 command = le16_to_cpu(resp->command);
u16 result = le16_to_cpu(resp->result);
......@@ -897,7 +901,7 @@ done:
return ret;
}
int lbs_ret_80211_ad_hoc_stop(lbs_private *priv,
int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv,
struct cmd_ds_command *resp)
{
lbs_deb_enter(LBS_DEB_JOIN);
......
drivers/net/wireless/libertas/join.h
View file @ 69f9032d
......@@ -12,41 +12,41 @@
#include "dev.h"
struct cmd_ds_command;
int lbs_cmd_80211_authenticate(lbs_private *priv,
int lbs_cmd_80211_authenticate(struct lbs_private *priv,
struct cmd_ds_command *cmd,
void *pdata_buf);
int lbs_cmd_80211_ad_hoc_join(lbs_private *priv,
int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,
struct cmd_ds_command *cmd,
void *pdata_buf);
int lbs_cmd_80211_ad_hoc_stop(lbs_private *priv,
int lbs_cmd_80211_ad_hoc_stop(struct lbs_private *priv,
struct cmd_ds_command *cmd);
int lbs_cmd_80211_ad_hoc_start(lbs_private *priv,
int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,
struct cmd_ds_command *cmd,
void *pdata_buf);
int lbs_cmd_80211_deauthenticate(lbs_private *priv,
int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,
struct cmd_ds_command *cmd);
int lbs_cmd_80211_associate(lbs_private *priv,
int lbs_cmd_80211_associate(struct lbs_private *priv,
struct cmd_ds_command *cmd,
void *pdata_buf);
int lbs_ret_80211_ad_hoc_start(lbs_private *priv,
int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,
struct cmd_ds_command *resp);
int lbs_ret_80211_ad_hoc_stop(lbs_private *priv,
int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv,
struct cmd_ds_command *resp);
int lbs_ret_80211_disassociate(lbs_private *priv,
int lbs_ret_80211_disassociate(struct lbs_private *priv,
struct cmd_ds_command *resp);
int lbs_ret_80211_associate(lbs_private *priv,
int lbs_ret_80211_associate(struct lbs_private *priv,
struct cmd_ds_command *resp);
int lbs_start_adhoc_network(lbs_private *priv,
int lbs_start_adhoc_network(struct lbs_private *priv,
struct assoc_request * assoc_req);
int lbs_join_adhoc_network(lbs_private *priv,
int lbs_join_adhoc_network(struct lbs_private *priv,
struct assoc_request * assoc_req);
int lbs_stop_adhoc_network(lbs_private *priv);
int lbs_stop_adhoc_network(struct lbs_private *priv);
int lbs_send_deauthentication(lbs_private *priv);
int lbs_send_deauthentication(struct lbs_private *priv);
int lbs_associate(lbs_private *priv, struct assoc_request *assoc_req);
int lbs_associate(struct lbs_private *priv, struct assoc_request *assoc_req);
void lbs_unset_basic_rate_flags(u8 *rates, size_t len);
......
drivers/net/wireless/libertas/main.c
View file @ 69f9032d
This diff is collapsed.
drivers/net/wireless/libertas/rx.c
View file @ 69f9032d
......@@ -35,19 +35,20 @@ struct rx80211packethdr {
void *eth80211_hdr;
} __attribute__ ((packed));
static int process_rxed_802_11_packet(lbs_private *priv, struct sk_buff *skb);
static int process_rxed_802_11_packet(struct lbs_private *priv,
struct sk_buff *skb);
/**
* @brief This function computes the avgSNR .
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @return avgSNR
*/
static u8 lbs_getavgsnr(lbs_private *priv)
static u8 lbs_getavgsnr(struct lbs_private *priv)
{
u8 i;
u16 temp = 0;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
if (adapter->numSNRNF == 0)
return 0;
for (i = 0; i < adapter->numSNRNF; i++)
......@@ -59,14 +60,14 @@ static u8 lbs_getavgsnr(lbs_private *priv)
/**
* @brief This function computes the AvgNF
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @return AvgNF
*/
static u8 lbs_getavgnf(lbs_private *priv)
static u8 lbs_getavgnf(struct lbs_private *priv)
{
u8 i;
u16 temp = 0;
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
if (adapter->numSNRNF == 0)
return 0;
for (i = 0; i < adapter->numSNRNF; i++)
......@@ -78,13 +79,13 @@ static u8 lbs_getavgnf(lbs_private *priv)
/**
* @brief This function save the raw SNR/NF to our internel buffer
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param prxpd A pointer to rxpd structure of received packet
* @return n/a
*/
static void lbs_save_rawSNRNF(lbs_private *priv, struct rxpd *p_rx_pd)
static void lbs_save_rawSNRNF(struct lbs_private *priv, struct rxpd *p_rx_pd)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
if (adapter->numSNRNF < DEFAULT_DATA_AVG_FACTOR)
adapter->numSNRNF++;
adapter->rawSNR[adapter->nextSNRNF] = p_rx_pd->snr;
......@@ -98,13 +99,13 @@ static void lbs_save_rawSNRNF(lbs_private *priv, struct rxpd *p_rx_pd)
/**
* @brief This function computes the RSSI in received packet.
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param prxpd A pointer to rxpd structure of received packet
* @return n/a
*/
static void lbs_compute_rssi(lbs_private *priv, struct rxpd *p_rx_pd)
static void lbs_compute_rssi(struct lbs_private *priv, struct rxpd *p_rx_pd)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
lbs_deb_enter(LBS_DEB_RX);
......@@ -134,7 +135,7 @@ static void lbs_compute_rssi(lbs_private *priv, struct rxpd *p_rx_pd)
lbs_deb_leave(LBS_DEB_RX);
}
void lbs_upload_rx_packet(lbs_private *priv, struct sk_buff *skb)
void lbs_upload_rx_packet(struct lbs_private *priv, struct sk_buff *skb)
{
lbs_deb_rx("skb->data %p\n", skb->data);
......@@ -154,13 +155,13 @@ void lbs_upload_rx_packet(lbs_private *priv, struct sk_buff *skb)
* @brief This function processes received packet and forwards it
* to kernel/upper layer
*
* @param priv A pointer to lbs_private
* @param priv A pointer to struct lbs_private
* @param skb A pointer to skb which includes the received packet
* @return 0 or -1
*/
int lbs_process_rxed_packet(lbs_private *priv, struct sk_buff *skb)
int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
struct rxpackethdr *p_rx_pkt;
......@@ -319,13 +320,14 @@ static u8 convert_mv_rate_to_radiotap(u8 rate)
* @brief This function processes a received 802.11 packet and forwards it
* to kernel/upper layer
*
* @param priv A pointer to lbs_private
* @param priv A pointer to struct lbs_private
* @param skb A pointer to skb which includes the received packet
* @return 0 or -1
*/
static int process_rxed_802_11_packet(lbs_private *priv, struct sk_buff *skb)
static int process_rxed_802_11_packet(struct lbs_private *priv,
struct sk_buff *skb)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int ret = 0;
struct rx80211packethdr *p_rx_pkt;
......
drivers/net/wireless/libertas/scan.c
View file @ 69f9032d
This diff is collapsed.
drivers/net/wireless/libertas/scan.h
View file @ 69f9032d
......@@ -10,6 +10,8 @@
#include <net/ieee80211.h>
#include "hostcmd.h"
struct lbs_adapter;
/**
* @brief Maximum number of channels that can be sent in a setuserscan ioctl
*
......@@ -176,27 +178,27 @@ struct bss_descriptor {
int lbs_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
struct bss_descriptor *lbs_find_ssid_in_list(lbs_adapter *adapter,
struct bss_descriptor *lbs_find_ssid_in_list(struct lbs_adapter *adapter,
u8 *ssid, u8 ssid_len, u8 *bssid, u8 mode,
int channel);
struct bss_descriptor *lbs_find_bssid_in_list(lbs_adapter *adapter,
struct bss_descriptor *lbs_find_bssid_in_list(struct lbs_adapter *adapter,
u8 *bssid, u8 mode);
int lbs_find_best_network_ssid(lbs_private *priv, u8 *out_ssid,
int lbs_find_best_network_ssid(struct lbs_private *priv, u8 *out_ssid,
u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode);
int lbs_send_specific_ssid_scan(lbs_private *priv, u8 *ssid,
int lbs_send_specific_ssid_scan(struct lbs_private *priv, u8 *ssid,
u8 ssid_len, u8 clear_ssid);
int lbs_cmd_80211_scan(lbs_private *priv,
int lbs_cmd_80211_scan(struct lbs_private *priv,
struct cmd_ds_command *cmd,
void *pdata_buf);
int lbs_ret_80211_scan(lbs_private *priv,
int lbs_ret_80211_scan(struct lbs_private *priv,
struct cmd_ds_command *resp);
int lbs_scan_networks(lbs_private *priv,
int lbs_scan_networks(struct lbs_private *priv,
const struct lbs_ioctl_user_scan_cfg *puserscanin,
int full_scan);
......
drivers/net/wireless/libertas/tx.c
View file @ 69f9032d
......@@ -52,11 +52,11 @@ static u32 convert_radiotap_rate_to_mv(u8 rate)
* @brief This function processes a single packet and sends
* to IF layer
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param skb A pointer to skb which includes TX packet
* @return 0 or -1
*/
static int SendSinglePacket(lbs_private *priv, struct sk_buff *skb)
static int SendSinglePacket(struct lbs_private *priv, struct sk_buff *skb)
{
int ret = 0;
struct txpd localtxpd;
......@@ -164,9 +164,9 @@ done:
}
void lbs_tx_runqueue(lbs_private *priv)
void lbs_tx_runqueue(struct lbs_private *priv)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
int i;
spin_lock(&adapter->txqueue_lock);
......@@ -180,9 +180,9 @@ void lbs_tx_runqueue(lbs_private *priv)
spin_unlock(&adapter->txqueue_lock);
}
static void lbs_tx_queue(lbs_private *priv, struct sk_buff *skb)
static void lbs_tx_queue(struct lbs_private *priv, struct sk_buff *skb)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
spin_lock(&adapter->txqueue_lock);
......@@ -205,10 +205,10 @@ static void lbs_tx_queue(lbs_private *priv, struct sk_buff *skb)
* @brief This function checks the conditions and sends packet to IF
* layer if everything is ok.
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @return n/a
*/
int lbs_process_tx(lbs_private *priv, struct sk_buff *skb)
int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb)
{
int ret = -1;
......@@ -239,14 +239,14 @@ done:
* @brief This function sends to the host the last transmitted packet,
* filling the radiotap headers with transmission information.
*
* @param priv A pointer to lbs_private structure
* @param priv A pointer to struct lbs_private structure
* @param status A 32 bit value containing transmission status.
*
* @returns void
*/
void lbs_send_tx_feedback(lbs_private *priv)
void lbs_send_tx_feedback(struct lbs_private *priv)
{
lbs_adapter *adapter = priv->adapter;
struct lbs_adapter *adapter = priv->adapter;
struct tx_radiotap_hdr *radiotap_hdr;
u32 status = adapter->eventcause;
int txfail;
......
drivers/net/wireless/libertas/wext.c
View file @ 69f9032d
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