Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd20a1b authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replaced various typedefs 



Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 69d90bb0

drivers/staging/brcm80211/brcmfmac/dhd.h

+3 −3
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ struct brcmf_bss_info { 
		uint count;	/* # rates in this set */

		u8 rates[16];	/* rates in 500kbps units w/hi bit set if basic */

	} rateset;		/* supported rates */

	chanspec_t chanspec;	/* chanspec for bss */

	u16 chanspec;	/* chanspec for bss */

	u16 atim_window;	/* units are Kusec */

	u8 dtim_period;	/* DTIM period */

	s16 RSSI;		/* receive signal strength (in dBm) */
@@ -464,10 +464,10 @@ struct brcmf_assoc_params { 
	s32 chanspec_num;	/* 0: all available channels,

				 * otherwise count of chanspecs in chanspec_list

				 */

	chanspec_t chanspec_list[1];	/* list of chanspecs */

	u16 chanspec_list[1];	/* list of chanspecs */

};

#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \

	(sizeof(struct brcmf_assoc_params) - sizeof(chanspec_t))

	(sizeof(struct brcmf_assoc_params) - sizeof(u16))



/* used for join with or without a specific bssid and channel list */

struct brcmf_join_params {

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+5 −5
Original line number Diff line number Diff line
@@ -2190,7 +2190,7 @@ brcmf_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev, 
			 struct cfg80211_pmksa *pmksa)

{

	struct brcmf_cfg80211_priv *cfg_priv = wiphy_to_cfg(wiphy);

	struct _pmkid_list *pmkids = &cfg_priv->pmk_list->pmkids;

	struct pmkid_list *pmkids = &cfg_priv->pmk_list->pmkids;

	s32 err = 0;

	int i;
@@ -2224,7 +2224,7 @@ brcmf_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, 
		      struct cfg80211_pmksa *pmksa)

{

	struct brcmf_cfg80211_priv *cfg_priv = wiphy_to_cfg(wiphy);

	struct _pmkid_list pmkid;

	struct pmkid_list pmkid;

	s32 err = 0;

	int i;
@@ -2247,7 +2247,7 @@ brcmf_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, 
	if ((cfg_priv->pmk_list->pmkids.npmkid > 0)

	    && (i < cfg_priv->pmk_list->pmkids.npmkid)) {

		memset(&cfg_priv->pmk_list->pmkids.pmkid[i], 0,

		       sizeof(pmkid_t));

		       sizeof(struct pmkid));

		for (; i < (cfg_priv->pmk_list->pmkids.npmkid - 1); i++) {

			memcpy(&cfg_priv->pmk_list->pmkids.pmkid[i].BSSID,

			       &cfg_priv->pmk_list->pmkids.pmkid[i + 1].BSSID,
@@ -2780,7 +2780,7 @@ static void brcmf_clear_assoc_ies(struct brcmf_cfg80211_priv *cfg_priv) 
static void brcmf_ch_to_chanspec(int ch, struct brcmf_join_params *join_params,

	size_t *join_params_size)

{

	chanspec_t chanspec = 0;

	u16 chanspec = 0;



	if (ch != 0) {

		join_params->params.chanspec_num = 1;
@@ -2795,7 +2795,7 @@ static void brcmf_ch_to_chanspec(int ch, struct brcmf_join_params *join_params, 
		chanspec |= WL_CHANSPEC_CTL_SB_NONE;



		*join_params_size += BRCMF_ASSOC_PARAMS_FIXED_SIZE +

			join_params->params.chanspec_num * sizeof(chanspec_t);

			join_params->params.chanspec_num * sizeof(u16);



		join_params->params.chanspec_list[0] &= WL_CHANSPEC_CHAN_MASK;

		join_params->params.chanspec_list[0] |= chanspec;

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h

+2 −2
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ struct brcmf_cfg80211_assoc_ielen { 


/* wpa2 pmk list */

struct brcmf_cfg80211_pmk_list {

	pmkid_list_t pmkids;

	pmkid_t foo[MAXPMKID - 1];

	struct pmkid_list pmkids;

	struct pmkid foo[MAXPMKID - 1];

};



/* dongle private data of cfg80211 interface */

drivers/staging/brcm80211/brcmsmac/ampdu.c

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi, 
	struct scb_ampdu_tid_ini *ini;

	u8 mcs = 0;

	bool use_rts = false, use_cts = false;

	ratespec_t rspec = 0, rspec_fallback = 0;

	ratespec_t rts_rspec = 0, rts_rspec_fallback = 0;

	u32 rspec = 0, rspec_fallback = 0;

	u32 rts_rspec = 0, rts_rspec_fallback = 0;

	u16 mimo_ctlchbw = PHY_TXC1_BW_20MHZ;

	struct ieee80211_rts *rts;

	u8 rr_retry_limit;

drivers/staging/brcm80211/brcmsmac/channel.c

+58 −53
Original line number Diff line number Diff line
@@ -30,10 +30,14 @@ 
#define	VALID_CHANNEL20(wlc, val) brcms_c_valid_channel20((wlc)->cmi, val)



struct brcms_cm_band {

	u8 locale_flags;	/* struct locale_info flags */

	chanvec_t valid_channels;	/* List of valid channels in the country */

	const chanvec_t *restricted_channels;	/* List of restricted use channels */

	const chanvec_t *radar_channels;	/* List of radar sensitive channels */

	/* struct locale_info flags */

	u8 locale_flags;

	/* List of valid channels in the country */

	struct brcms_chanvec valid_channels;

	/* List of restricted use channels */

	const struct brcms_chanvec *restricted_channels;

	/* List of radar sensitive channels */

	const struct brcms_chanvec *radar_channels;

	u8 PAD[8];

};
@@ -49,7 +53,8 @@ struct brcms_cm_info { 
	/* per-band state (one per phy/radio) */

	struct brcms_cm_band bandstate[MAXBANDS];

	/* quiet channels currently for radar sensitivity or 11h support */

	chanvec_t quiet_channels;	/* channels on which we cannot transmit */

	/* channels on which we cannot transmit */

	struct brcms_chanvec quiet_channels;

};



static int brcms_c_channels_init(struct brcms_cm_info *wlc_cm,
@@ -78,7 +83,7 @@ brcms_c_countrycode_map(struct brcms_cm_info *wlc_cm, 
static void brcms_c_channels_commit(struct brcms_cm_info *wlc_cm);

static void brcms_c_quiet_channels_reset(struct brcms_cm_info *wlc_cm);

static bool brcms_c_quiet_chanspec(struct brcms_cm_info *wlc_cm,

				   chanspec_t chspec);

				   u16 chspec);

static bool brcms_c_valid_channel20_db(struct brcms_cm_info *wlc_cm, uint val);

static bool brcms_c_valid_channel20_in_band(struct brcms_cm_info *wlc_cm,

					    uint bandunit, uint val);
@@ -88,7 +93,7 @@ static const struct country_info * 
brcms_c_country_lookup(struct brcms_c_info *wlc, const char *ccode);



static void brcms_c_locale_get_channels(const struct locale_info *locale,

				    chanvec_t *valid_channels);

				    struct brcms_chanvec *valid_channels);

static const struct locale_info *brcms_c_get_locale_2g(u8 locale_idx);

static const struct locale_info *brcms_c_get_locale_5g(u8 locale_idx);

static bool brcms_c_japan(struct brcms_c_info *wlc);
@@ -96,8 +101,8 @@ static bool brcms_c_japan_ccode(const char *ccode); 
static void brcms_c_channel_min_txpower_limits_with_local_constraint(

	struct brcms_cm_info *wlc_cm, struct txpwr_limits *txpwr,

	u8 local_constraint_qdbm);

static void brcms_c_locale_add_channels(chanvec_t *target,

				    const chanvec_t *channels);

static void brcms_c_locale_add_channels(struct brcms_chanvec *target,

				    const struct brcms_chanvec *channels);

static const struct locale_mimo_info *brcms_c_get_mimo_2g(u8 locale_idx);

static const struct locale_mimo_info *brcms_c_get_mimo_5g(u8 locale_idx);
@@ -114,7 +119,7 @@ static const struct locale_mimo_info *brcms_c_get_mimo_5g(u8 locale_idx); 
 */



/* No channels */

static const chanvec_t chanvec_none = {

static const struct brcms_chanvec chanvec_none = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -122,7 +127,7 @@ static const chanvec_t chanvec_none = { 
};



/* All 2.4 GHz HW channels */

const chanvec_t chanvec_all_2G = {

const struct brcms_chanvec chanvec_all_2G = {

	{0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -130,7 +135,7 @@ const chanvec_t chanvec_all_2G = { 
};



/* All 5 GHz HW channels */

const chanvec_t chanvec_all_5G = {

const struct brcms_chanvec chanvec_all_5G = {

	{0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x11, 0x11,

	 0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11,

	 0x11, 0x11, 0x20, 0x22, 0x22, 0x00, 0x00, 0x11,
@@ -144,7 +149,8 @@ const chanvec_t chanvec_all_5G = { 
/* No radar */

#define radar_set_none chanvec_none



static const chanvec_t radar_set1 = {	/* Channels 52 - 64, 100 - 140 */

/* Channels 52 - 64, 100 - 140 */

static const struct brcms_chanvec radar_set1 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11,	/* 52 - 60 */

	 0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11,	/* 64, 100 - 124 */

	 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* 128 - 140 */
@@ -158,7 +164,7 @@ static const chanvec_t radar_set1 = { /* Channels 52 - 64, 100 - 140 */ 
#define restricted_set_none chanvec_none



/* Channels 34, 38, 42, 46 */

static const chanvec_t restricted_set_japan_legacy = {

static const struct brcms_chanvec restricted_set_japan_legacy = {

	{0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -166,7 +172,7 @@ static const chanvec_t restricted_set_japan_legacy = { 
};



/* Channels 12, 13 */

static const chanvec_t restricted_set_2g_short = {

static const struct brcms_chanvec restricted_set_2g_short = {

	{0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -174,7 +180,7 @@ static const chanvec_t restricted_set_2g_short = { 
};



/* Channel 165 */

static const chanvec_t restricted_chan_165 = {

static const struct brcms_chanvec restricted_chan_165 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
@@ -182,7 +188,7 @@ static const chanvec_t restricted_chan_165 = { 
};



/* Channels 36 - 48 & 149 - 165 */

static const chanvec_t restricted_low_hi = {

static const struct brcms_chanvec restricted_low_hi = {

	{0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x01, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x20, 0x22, 0x22, 0x00, 0x00, 0x00,
@@ -190,7 +196,7 @@ static const chanvec_t restricted_low_hi = { 
};



/* Channels 12 - 14 */

static const chanvec_t restricted_set_12_13_14 = {

static const struct brcms_chanvec restricted_set_12_13_14 = {

	{0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -239,12 +245,12 @@ static const chanvec_t restricted_set_12_13_14 = { 


/* global memory to provide working buffer for expanded locale */



static const chanvec_t *g_table_radar_set[] = {

static const struct brcms_chanvec *g_table_radar_set[] = {

	&chanvec_none,

	&radar_set1

};



static const chanvec_t *g_table_restricted_chan[] = {

static const struct brcms_chanvec *g_table_restricted_chan[] = {

	&chanvec_none,		/* restricted_set_none */

	&restricted_set_2g_short,

	&restricted_chan_165,
@@ -256,119 +262,119 @@ static const chanvec_t *g_table_restricted_chan[] = { 
	&restricted_set_12_13_14

};



static const chanvec_t locale_2g_01_11 = {

static const struct brcms_chanvec locale_2g_01_11 = {

	{0xfe, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_2g_12_13 = {

static const struct brcms_chanvec locale_2g_12_13 = {

	{0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_2g_14 = {

static const struct brcms_chanvec locale_2g_14 = {

	{0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_LOW_JP1 = {

static const struct brcms_chanvec locale_5g_LOW_JP1 = {

	{0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_LOW_JP2 = {

static const struct brcms_chanvec locale_5g_LOW_JP2 = {

	{0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_LOW1 = {

static const struct brcms_chanvec locale_5g_LOW1 = {

	{0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x01, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_LOW2 = {

static const struct brcms_chanvec locale_5g_LOW2 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_LOW3 = {

static const struct brcms_chanvec locale_5g_LOW3 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,

	 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_MID1 = {

static const struct brcms_chanvec locale_5g_MID1 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_MID2 = {

static const struct brcms_chanvec locale_5g_MID2 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_MID3 = {

static const struct brcms_chanvec locale_5g_MID3 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_HIGH1 = {

static const struct brcms_chanvec locale_5g_HIGH1 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_HIGH2 = {

static const struct brcms_chanvec locale_5g_HIGH2 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x20, 0x22, 0x02, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_HIGH3 = {

static const struct brcms_chanvec locale_5g_HIGH3 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_52_140_ALL = {

static const struct brcms_chanvec locale_5g_52_140_ALL = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11,

	 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,

	 0x11, 0x11, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00}

};



static const chanvec_t locale_5g_HIGH4 = {

static const struct brcms_chanvec locale_5g_HIGH4 = {

	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,

	 0x11, 0x11, 0x11, 0x11}

};



static const chanvec_t *g_table_locale_base[] = {

static const struct brcms_chanvec *g_table_locale_base[] = {

	&locale_2g_01_11,

	&locale_2g_12_13,

	&locale_2g_14,
@@ -387,21 +393,20 @@ static const chanvec_t *g_table_locale_base[] = { 
	&locale_5g_HIGH4

};



static void brcms_c_locale_add_channels(chanvec_t *target,

				    const chanvec_t *channels)

static void brcms_c_locale_add_channels(struct brcms_chanvec *target,

				    const struct brcms_chanvec *channels)

{

	u8 i;

	for (i = 0; i < sizeof(chanvec_t); i++) {

	for (i = 0; i < sizeof(struct brcms_chanvec); i++)

		target->vec[i] |= channels->vec[i];

}

}



static void brcms_c_locale_get_channels(const struct locale_info *locale,

				    chanvec_t *channels)

				    struct brcms_chanvec *channels)

{

	u8 i;



	memset(channels, 0, sizeof(chanvec_t));

	memset(channels, 0, sizeof(struct brcms_chanvec));



	for (i = 0; i < ARRAY_SIZE(g_table_locale_base); i++) {

		if (locale->valid_channels & (1 << i)) {
@@ -870,7 +875,7 @@ brcms_c_channels_init(struct brcms_cm_info *wlc_cm, 
	uint i, j;

	struct brcms_band *band;

	const struct locale_info *li;

	chanvec_t sup_chan;

	struct brcms_chanvec sup_chan;

	const struct locale_mimo_info *li_mimo;



	band = wlc->band;
@@ -902,7 +907,7 @@ brcms_c_channels_init(struct brcms_cm_info *wlc_cm, 
		brcms_c_locale_get_channels(li,

					&wlc_cm->bandstate[band->bandunit].

					valid_channels);

		for (j = 0; j < sizeof(chanvec_t); j++)

		for (j = 0; j < sizeof(struct brcms_chanvec); j++)

			wlc_cm->bandstate[band->bandunit].valid_channels.

			    vec[j] &= sup_chan.vec[j];

	}
@@ -969,9 +974,9 @@ static void brcms_c_quiet_channels_reset(struct brcms_cm_info *wlc_cm) 
	struct brcms_c_info *wlc = wlc_cm->wlc;

	uint i, j;

	struct brcms_band *band;

	const chanvec_t *chanvec;

	const struct brcms_chanvec *chanvec;



	memset(&wlc_cm->quiet_channels, 0, sizeof(chanvec_t));

	memset(&wlc_cm->quiet_channels, 0, sizeof(struct brcms_chanvec));



	band = wlc->band;

	for (i = 0; i < NBANDS(wlc);
@@ -979,14 +984,14 @@ static void brcms_c_quiet_channels_reset(struct brcms_cm_info *wlc_cm) 


		/* initialize quiet channels for restricted channels */

		chanvec = wlc_cm->bandstate[band->bandunit].restricted_channels;

		for (j = 0; j < sizeof(chanvec_t); j++)

		for (j = 0; j < sizeof(struct brcms_chanvec); j++)

			wlc_cm->quiet_channels.vec[j] |= chanvec->vec[j];



	}

}



static bool

brcms_c_quiet_chanspec(struct brcms_cm_info *wlc_cm, chanspec_t chspec)

brcms_c_quiet_chanspec(struct brcms_cm_info *wlc_cm, u16 chspec)

{

	return N_ENAB(wlc_cm->wlc->pub) && CHSPEC_IS40(chspec) ?

		(isset
@@ -1117,7 +1122,7 @@ brcms_c_channel_min_txpower_limits_with_local_constraint( 
}



void

brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, chanspec_t chanspec,

brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,

			 u8 local_constraint_qdbm)

{

	struct brcms_c_info *wlc = wlc_cm->wlc;
@@ -1261,7 +1266,7 @@ static void wlc_phy_txpower_limits_dump(struct txpwr_limits *txpwr) 
#endif				/* POWER_DBG */



void

brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, chanspec_t chanspec,

brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,

		       struct txpwr_limits *txpwr)

{

	struct brcms_c_info *wlc = wlc_cm->wlc;
@@ -1490,7 +1495,7 @@ static bool brcms_c_japan_ccode(const char *ccode) 
 * are valid 20MZH channels in this locale and they are also a legal HT combination

 */

static bool

brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, chanspec_t chspec,

brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec,

			   bool dualband)

{

	struct brcms_c_info *wlc = wlc_cm->wlc;
@@ -1552,7 +1557,7 @@ brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, chanspec_t chspec, 
	return false;

}



bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm, chanspec_t chspec)

bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm, u16 chspec)

{

	return brcms_c_valid_chanspec_ext(wlc_cm, chspec, true);

}