Skip to content

Commit

Permalink
libertas: remove arbitrary typedefs
Browse files Browse the repository at this point in the history 
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: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Holger Schurig authored and David S. Miller committed Jan 28, 2008
1 parent 96287ac commit 69f9032
Show file tree
Hide file tree
Showing 23 changed files with 606 additions and 565 deletions.
34 changes: 17 additions & 17 deletions drivers/net/wireless/libertas/11d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;

Expand All @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -552,11 +552,11 @@ int lbs_cmd_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
* @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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -640,13 +640,13 @@ int lbs_parse_dnld_countryinfo_11d(lbs_private * priv,

/**
* @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;

Expand Down
14 changes: 8 additions & 6 deletions drivers/net/wireless/libertas/11d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
48 changes: 25 additions & 23 deletions drivers/net/wireless/libertas/assoc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -109,7 +109,7 @@ static int assoc_helper_bssid(lbs_private *priv,
}


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;
Expand All @@ -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);
Expand All @@ -165,7 +165,7 @@ static int assoc_helper_mode(lbs_private *priv,
}


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 */
Expand All @@ -179,18 +179,19 @@ 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)
lbs_pr_info("Channel synchronization failed.");
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);
Expand Down Expand Up @@ -242,10 +243,10 @@ static int assoc_helper_channel(lbs_private *priv,
}


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;

Expand Down Expand Up @@ -297,10 +298,10 @@ static int assoc_helper_wep_keys(lbs_private *priv,
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;
Expand Down Expand Up @@ -349,7 +350,7 @@ static int assoc_helper_secinfo(lbs_private *priv,
}


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;
Expand Down Expand Up @@ -392,10 +393,10 @@ static int assoc_helper_wpa_keys(lbs_private *priv,
}


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);
Expand All @@ -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;
Expand Down Expand Up @@ -465,7 +466,7 @@ static int should_deauth_infrastructure(lbs_adapter *adapter,
}


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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -684,7 +686,7 @@ void lbs_association_worker(struct work_struct *work)
/*
* 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;

Expand Down
4 changes: 1 addition & 3 deletions drivers/net/wireless/libertas/assoc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Loading

0 comments on commit 69f9032

Please sign in to comment.