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

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

staging: brcm80211: further replaced wlc_ by brcmsmac_c_ 



Code cleanup. Renamed functions.

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

drivers/staging/brcm80211/brcmsmac/alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void wlc_bsscfg_ID_assign(struct brcms_c_info *wlc, 
/*

 * The common driver entry routine. Error codes should be unique

 */

struct brcms_c_info *wlc_attach_malloc(uint unit, uint *err, uint devid)

struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid)

{

	struct brcms_c_info *wlc;
@@ -246,11 +246,11 @@ struct brcms_c_info *wlc_attach_malloc(uint unit, uint *err, uint devid) 
	return wlc;



 fail:

	wlc_detach_mfree(wlc);

	brcms_c_detach_mfree(wlc);

	return NULL;

}



void wlc_detach_mfree(struct brcms_c_info *wlc)

void brcms_c_detach_mfree(struct brcms_c_info *wlc)

{

	if (wlc == NULL)

		return;

drivers/staging/brcm80211/brcmsmac/alloc.h

+3 −2
Original line number Diff line number Diff line
@@ -14,5 +14,6 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



extern struct brcms_c_info *wlc_attach_malloc(uint unit, uint *err, uint devid);

extern void wlc_detach_mfree(struct brcms_c_info *wlc);
 
extern struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err,

						  uint devid);

extern void brcms_c_detach_mfree(struct brcms_c_info *wlc);

drivers/staging/brcm80211/brcmsmac/ampdu.c

+58 −53
Original line number Diff line number Diff line
@@ -110,35 +110,37 @@ struct cb_del_ampdu_pars { 
#define SCB_AMPDU_CUBBY(ampdu, scb) (&(scb->scb_ampdu))

#define SCB_AMPDU_INI(scb_ampdu, tid) (&(scb_ampdu->ini[tid]))



static void wlc_ffpld_init(struct ampdu_info *ampdu);

static int wlc_ffpld_check_txfunfl(struct brcms_c_info *wlc, int f);

static void wlc_ffpld_calc_mcs2ampdu_table(struct ampdu_info *ampdu, int f);

static void brcms_c_ffpld_init(struct ampdu_info *ampdu);

static int brcms_c_ffpld_check_txfunfl(struct brcms_c_info *wlc, int f);

static void brcms_c_ffpld_calc_mcs2ampdu_table(struct ampdu_info *ampdu, int f);



static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(struct ampdu_info *ampdu,

static scb_ampdu_tid_ini_t *brcms_c_ampdu_init_tid_ini(struct ampdu_info *ampdu,

						   scb_ampdu_t *scb_ampdu,

						   u8 tid, bool override);

static void ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur);

static void scb_ampdu_update_config(struct ampdu_info *ampdu, struct scb *scb);

static void scb_ampdu_update_config_all(struct ampdu_info *ampdu);

static void brcms_c_scb_ampdu_update_max_txlen(struct ampdu_info *ampdu,

					       u8 dur);

static void brcms_c_scb_ampdu_update_config(struct ampdu_info *ampdu,

					    struct scb *scb);

static void brcms_c_scb_ampdu_update_config_all(struct ampdu_info *ampdu);



#define wlc_ampdu_txflowcontrol(a, b, c)	do {} while (0)

#define brcms_c_ampdu_txflowcontrol(a, b, c)	do {} while (0)



static void wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu,

static void brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu,

					  struct scb *scb,

					  struct sk_buff *p, tx_status_t *txs,

					  u32 frmtxstatus, u32 frmtxstatus2);

static bool wlc_ampdu_cap(struct ampdu_info *ampdu);

static int wlc_ampdu_set(struct ampdu_info *ampdu, bool on);

static bool brcms_c_ampdu_cap(struct ampdu_info *ampdu);

static int brcms_c_ampdu_set(struct ampdu_info *ampdu, bool on);



struct ampdu_info *wlc_ampdu_attach(struct brcms_c_info *wlc)

struct ampdu_info *brcms_c_ampdu_attach(struct brcms_c_info *wlc)

{

	struct ampdu_info *ampdu;

	int i;



	ampdu = kzalloc(sizeof(struct ampdu_info), GFP_ATOMIC);

	if (!ampdu) {

		wiphy_err(wlc->wiphy, "wl%d: wlc_ampdu_attach: out of mem\n",

			  wlc->pub->unit);

		wiphy_err(wlc->wiphy, "wl%d: brcms_c_ampdu_attach: out of mem"

			  "\n", wlc->pub->unit);

		return NULL;

	}

	ampdu->wlc = wlc;
@@ -174,18 +176,18 @@ struct ampdu_info *wlc_ampdu_attach(struct brcms_c_info *wlc) 
		ampdu->rr_retry_limit_tid[i] = ampdu->rr_retry_limit;

	}



	ampdu_update_max_txlen(ampdu, ampdu->dur);

	brcms_c_scb_ampdu_update_max_txlen(ampdu, ampdu->dur);

	ampdu->mfbr = false;

	/* try to set ampdu to the default value */

	wlc_ampdu_set(ampdu, wlc->pub->_ampdu);

	brcms_c_ampdu_set(ampdu, wlc->pub->_ampdu);



	ampdu->tx_max_funl = FFPLD_TX_MAX_UNFL;

	wlc_ffpld_init(ampdu);

	brcms_c_ffpld_init(ampdu);



	return ampdu;

}



void wlc_ampdu_detach(struct ampdu_info *ampdu)

void brcms_c_ampdu_detach(struct ampdu_info *ampdu)

{

	int i;
@@ -201,7 +203,8 @@ void wlc_ampdu_detach(struct ampdu_info *ampdu) 
	kfree(ampdu);

}



static void scb_ampdu_update_config(struct ampdu_info *ampdu, struct scb *scb)

static void brcms_c_scb_ampdu_update_config(struct ampdu_info *ampdu,

					    struct scb *scb)

{

	scb_ampdu_t *scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);

	int i;
@@ -229,12 +232,12 @@ static void scb_ampdu_update_config(struct ampdu_info *ampdu, struct scb *scb) 
				 mcs2ampdu_table[FFPLD_MAX_MCS]);

}



static void scb_ampdu_update_config_all(struct ampdu_info *ampdu)

static void brcms_c_scb_ampdu_update_config_all(struct ampdu_info *ampdu)

{

	scb_ampdu_update_config(ampdu, ampdu->wlc->pub->global_scb);

	brcms_c_scb_ampdu_update_config(ampdu, ampdu->wlc->pub->global_scb);

}



static void wlc_ffpld_init(struct ampdu_info *ampdu)

static void brcms_c_ffpld_init(struct ampdu_info *ampdu)

{

	int i, j;

	wlc_fifo_info_t *fifo;
@@ -258,7 +261,7 @@ static void wlc_ffpld_init(struct ampdu_info *ampdu) 
 * Return 1 if pre-loading not active, -1 if not an underflow event,

 * 0 if pre-loading module took care of the event.

 */

static int wlc_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid)

static int brcms_c_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid)

{

	struct ampdu_info *ampdu = wlc->ampdu;

	u32 phy_rate = MCS_RATE(FFPLD_MAX_MCS, true, false);
@@ -339,7 +342,7 @@ static int wlc_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid) 
			fifo->ampdu_pld_size = max_pld_size;



		/* update scb release size */

		scb_ampdu_update_config_all(ampdu);

		brcms_c_scb_ampdu_update_config_all(ampdu);



		/*

		   compute a new dma xfer rate for max_mpdu @ max mcs.
@@ -366,17 +369,17 @@ static int wlc_ffpld_check_txfunfl(struct brcms_c_info *wlc, int fid) 
				fifo->mcs2ampdu_table[FFPLD_MAX_MCS] -= 1;



			/* recompute the table */

			wlc_ffpld_calc_mcs2ampdu_table(ampdu, fid);

			brcms_c_ffpld_calc_mcs2ampdu_table(ampdu, fid);



			/* update scb release size */

			scb_ampdu_update_config_all(ampdu);

			brcms_c_scb_ampdu_update_config_all(ampdu);

		}

	}

	fifo->accum_txfunfl = 0;

	return 0;

}



static void wlc_ffpld_calc_mcs2ampdu_table(struct ampdu_info *ampdu, int f)

static void brcms_c_ffpld_calc_mcs2ampdu_table(struct ampdu_info *ampdu, int f)

{

	int i;

	u32 phy_rate, dma_rate, tmp;
@@ -409,7 +412,7 @@ static void wlc_ffpld_calc_mcs2ampdu_table(struct ampdu_info *ampdu, int f) 
}



static void

wlc_ampdu_agg(struct ampdu_info *ampdu, struct scb *scb, struct sk_buff *p,

brcms_c_ampdu_agg(struct ampdu_info *ampdu, struct scb *scb, struct sk_buff *p,

	      uint prec)

{

	scb_ampdu_t *scb_ampdu;
@@ -421,13 +424,13 @@ wlc_ampdu_agg(struct ampdu_info *ampdu, struct scb *scb, struct sk_buff *p, 
	/* initialize initiator on first packet; sends addba req */

	ini = SCB_AMPDU_INI(scb_ampdu, tid);

	if (ini->magic != INI_MAGIC) {

		ini = wlc_ampdu_init_tid_ini(ampdu, scb_ampdu, tid, false);

		ini = brcms_c_ampdu_init_tid_ini(ampdu, scb_ampdu, tid, false);

	}

	return;

}



int

wlc_sendampdu(struct ampdu_info *ampdu, struct brcms_c_txq_info *qi,

brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_c_txq_info *qi,

	      struct sk_buff **pdu, int prec)

{

	struct brcms_c_info *wlc;
@@ -480,7 +483,7 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct brcms_c_txq_info *qi, 
		return -EBUSY;

	}



	wlc_ampdu_agg(ampdu, scb, p, tid);

	brcms_c_ampdu_agg(ampdu, scb, p, tid);



	rr_retry_limit = ampdu->rr_retry_limit_tid[tid];

	ampdu_len = 0;
@@ -808,7 +811,7 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct brcms_c_txq_info *qi, 
}



void

wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,

brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,

		     struct sk_buff *p, tx_status_t *txs)

{

	scb_ampdu_t *scb_ampdu;
@@ -841,7 +844,7 @@ wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb, 
	if (likely(scb)) {

		scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);

		ini = SCB_AMPDU_INI(scb_ampdu, p->priority);

		wlc_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2);

		brcms_c_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2);

	} else {

		/* loop through all pkts and free */

		u8 queue = txs->frameid & TXFID_QUEUE_MASK;
@@ -860,11 +863,12 @@ wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb, 
		}

		brcms_c_txfifo_complete(wlc, queue, ampdu->txpkt_weight);

	}

	wlc_ampdu_txflowcontrol(wlc, scb_ampdu, ini);

	brcms_c_ampdu_txflowcontrol(wlc, scb_ampdu, ini);

}



static void

rate_status(struct brcms_c_info *wlc, struct ieee80211_tx_info *tx_info,

brcms_c_ampdu_rate_status(struct brcms_c_info *wlc,

			  struct ieee80211_tx_info *tx_info,

			  tx_status_t *txs, u8 mcs)

{

	struct ieee80211_tx_rate *txrate = tx_info->status.rates;
@@ -880,7 +884,7 @@ rate_status(struct brcms_c_info *wlc, struct ieee80211_tx_info *tx_info, 
#define SHORTNAME "AMPDU status"



static void

wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,

brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,

			      struct sk_buff *p, tx_status_t *txs,

			      u32 s1, u32 s2)

{
@@ -954,8 +958,8 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
					  wlc->default_bss->chanspec));

			} else {

				if (supr_status != TX_STATUS_SUPR_FRAG)

					wiphy_err(wiphy, "%s: wlc_ampdu_dotx"

						  "status:supr_status 0x%x\n",

					wiphy_err(wiphy, "%s:"

						  "supr_status 0x%x\n",

						  __func__, supr_status);

			}

			/* no need to retry for badch; will fail again */
@@ -968,14 +972,14 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
				/* if there were underflows, but pre-loading is not active,

				   notify rate adaptation.

				 */

				if (wlc_ffpld_check_txfunfl(wlc, prio2fifo[tid])

				    > 0) {

				if (brcms_c_ffpld_check_txfunfl(wlc,

							prio2fifo[tid]) > 0) {

					tx_error = true;

				}

			}

		} else if (txs->phyerr) {

			update_rate = false;

			wiphy_err(wiphy, "wl%d: wlc_ampdu_dotxstatus: tx phy "

			wiphy_err(wiphy, "wl%d: ampdu tx phy "

				  "error (0x%x)\n", wlc->pub->unit,

				  txs->phyerr);
@@ -1017,7 +1021,8 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 


				/* ampdu_ack_len: number of acked aggregated frames */

				/* ampdu_len: number of aggregated frames */

				rate_status(wlc, tx_info, txs, mcs);

				brcms_c_ampdu_rate_status(wlc, tx_info, txs,

							  mcs);

				tx_info->flags |= IEEE80211_TX_STAT_ACK;

				tx_info->flags |= IEEE80211_TX_STAT_AMPDU;

				tx_info->status.ampdu_ack_len =
@@ -1073,13 +1078,13 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
	brcms_c_send_q(wlc);



	/* update rate state */

	antselid = wlc_antsel_antsel2id(wlc->asi, mimoantsel);

	antselid = brcms_c_antsel_antsel2id(wlc->asi, mimoantsel);



	brcms_c_txfifo_complete(wlc, queue, ampdu->txpkt_weight);

}



/* initialize the initiator code for tid */

static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(struct ampdu_info *ampdu,

static scb_ampdu_tid_ini_t *brcms_c_ampdu_init_tid_ini(struct ampdu_info *ampdu,

						   scb_ampdu_t *scb_ampdu,

						   u8 tid, bool override)

{
@@ -1099,7 +1104,7 @@ static scb_ampdu_tid_ini_t *wlc_ampdu_init_tid_ini(struct ampdu_info *ampdu, 
	return ini;

}



static int wlc_ampdu_set(struct ampdu_info *ampdu, bool on)

static int brcms_c_ampdu_set(struct ampdu_info *ampdu, bool on)

{

	struct brcms_c_info *wlc = ampdu->wlc;
@@ -1111,7 +1116,7 @@ static int wlc_ampdu_set(struct ampdu_info *ampdu, bool on) 
				"nmode enabled\n", wlc->pub->unit);

			return -ENOTSUPP;

		}

		if (!wlc_ampdu_cap(ampdu)) {

		if (!brcms_c_ampdu_cap(ampdu)) {

			wiphy_err(ampdu->wlc->wiphy, "wl%d: device not "

				"ampdu capable\n", wlc->pub->unit);

			return -ENOTSUPP;
@@ -1122,7 +1127,7 @@ static int wlc_ampdu_set(struct ampdu_info *ampdu, bool on) 
	return 0;

}



static bool wlc_ampdu_cap(struct ampdu_info *ampdu)

static bool brcms_c_ampdu_cap(struct ampdu_info *ampdu)

{

	if (WLC_PHY_11N_CAP(ampdu->wlc->band))

		return true;
@@ -1130,7 +1135,7 @@ static bool wlc_ampdu_cap(struct ampdu_info *ampdu) 
		return false;

}



static void ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur)

static void brcms_c_scb_ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur)

{

	u32 rate, mcs;
@@ -1151,7 +1156,7 @@ static void ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur) 
	}

}



void wlc_ampdu_macaddr_upd(struct brcms_c_info *wlc)

void brcms_c_ampdu_macaddr_upd(struct brcms_c_info *wlc)

{

	char template[T_RAM_ACCESS_SZ * 2];
@@ -1168,7 +1173,7 @@ bool brcms_c_aggregatable(struct brcms_c_info *wlc, u8 tid) 
	return wlc->ampdu->ini_enable[tid];

}



void wlc_ampdu_shm_upd(struct ampdu_info *ampdu)

void brcms_c_ampdu_shm_upd(struct ampdu_info *ampdu)

{

	struct brcms_c_info *wlc = ampdu->wlc;
@@ -1217,7 +1222,7 @@ static void dma_cb_fn_ampdu(void *txi, void *arg_a) 
 * When a remote party is no longer available for ampdu communication, any

 * pending tx ampdu packets in the driver have to be flushed.

 */

void wlc_ampdu_flush(struct brcms_c_info *wlc,

void brcms_c_ampdu_flush(struct brcms_c_info *wlc,

		     struct ieee80211_sta *sta, u16 tid)

{

	struct brcms_c_txq_info *qi = wlc->pkt_queue;

drivers/staging/brcm80211/brcmsmac/ampdu.h

+8 −7
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 
#ifndef _BRCM_AMPDU_H_

#define _BRCM_AMPDU_H_



extern struct ampdu_info *wlc_ampdu_attach(struct brcms_c_info *wlc);

extern void wlc_ampdu_detach(struct ampdu_info *ampdu);

extern int wlc_sendampdu(struct ampdu_info *ampdu, struct brcms_c_txq_info *qi,

extern struct ampdu_info *brcms_c_ampdu_attach(struct brcms_c_info *wlc);

extern void brcms_c_ampdu_detach(struct ampdu_info *ampdu);

extern int brcms_c_sendampdu(struct ampdu_info *ampdu,

			     struct brcms_c_txq_info *qi,

			     struct sk_buff **aggp, int prec);

extern void wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,

extern void brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,

				 struct sk_buff *p, tx_status_t *txs);

extern void wlc_ampdu_macaddr_upd(struct brcms_c_info *wlc);

extern void wlc_ampdu_shm_upd(struct ampdu_info *ampdu);

extern void brcms_c_ampdu_macaddr_upd(struct brcms_c_info *wlc);

extern void brcms_c_ampdu_shm_upd(struct ampdu_info *ampdu);



#endif				/* _BRCM_AMPDU_H_ */

drivers/staging/brcm80211/brcmsmac/antsel.c

+25 −23
Original line number Diff line number Diff line
@@ -50,10 +50,11 @@ 
#define ANT_SELCFG_DEF_2x4	0x02	/* default antenna configuration */



/* static functions */

static int wlc_antsel_cfgupd(struct antsel_info *asi, wlc_antselcfg_t *antsel);

static u8 wlc_antsel_id2antcfg(struct antsel_info *asi, u8 id);

static u16 wlc_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg);

static void wlc_antsel_init_cfg(struct antsel_info *asi,

static int brcms_c_antsel_cfgupd(struct antsel_info *asi,

				 wlc_antselcfg_t *antsel);

static u8 brcms_c_antsel_id2antcfg(struct antsel_info *asi, u8 id);

static u16 brcms_c_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg);

static void brcms_c_antsel_init_cfg(struct antsel_info *asi,

				wlc_antselcfg_t *antsel,

				bool auto_sel);
@@ -81,14 +82,14 @@ const u8 mimo_2x3_div_antselid_tbl[16] = { 
	0, 0, 0, 0, 0, 0, 0, 0	/* pat to antselid */

};



struct antsel_info *wlc_antsel_attach(struct brcms_c_info *wlc)

struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc)

{

	struct antsel_info *asi;



	asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);

	if (!asi) {

		wiphy_err(wlc->wiphy, "wl%d: wlc_antsel_attach: out of mem\n",

			  wlc->pub->unit);

		wiphy_err(wlc->wiphy, "wl%d: brcms_c_antsel_attach: out of "

			  "mem\n", wlc->pub->unit);

		return NULL;

	}
@@ -117,7 +118,7 @@ struct antsel_info *wlc_antsel_attach(struct brcms_c_info *wlc) 
				asi->antsel_avail = false;

			} else {

				asi->antsel_avail = false;

				wiphy_err(wlc->wiphy, "wlc_antsel_attach: 2o3 "

				wiphy_err(wlc->wiphy, "antsel_attach: 2o3 "

					  "board cfg invalid\n");

			}

			break;
@@ -139,27 +140,27 @@ struct antsel_info *wlc_antsel_attach(struct brcms_c_info *wlc) 
	brcms_b_antsel_type_set(wlc->hw, asi->antsel_type);



	/* Init (auto/manual) antenna selection */

	wlc_antsel_init_cfg(asi, &asi->antcfg_11n, true);

	wlc_antsel_init_cfg(asi, &asi->antcfg_cur, true);

	brcms_c_antsel_init_cfg(asi, &asi->antcfg_11n, true);

	brcms_c_antsel_init_cfg(asi, &asi->antcfg_cur, true);



	return asi;

}



void wlc_antsel_detach(struct antsel_info *asi)

void brcms_c_antsel_detach(struct antsel_info *asi)

{

	kfree(asi);

}



void wlc_antsel_init(struct antsel_info *asi)

void brcms_c_antsel_init(struct antsel_info *asi)

{

	if ((asi->antsel_type == ANTSEL_2x3) ||

	    (asi->antsel_type == ANTSEL_2x4))

		wlc_antsel_cfgupd(asi, &asi->antcfg_11n);

		brcms_c_antsel_cfgupd(asi, &asi->antcfg_11n);

}



/* boardlevel antenna selection: init antenna selection structure */

static void

wlc_antsel_init_cfg(struct antsel_info *asi, wlc_antselcfg_t *antsel,

brcms_c_antsel_init_cfg(struct antsel_info *asi, wlc_antselcfg_t *antsel,

		    bool auto_sel)

{

	if (asi->antsel_type == ANTSEL_2x3) {
@@ -190,7 +191,7 @@ wlc_antsel_init_cfg(struct antsel_info *asi, wlc_antselcfg_t *antsel, 
}



void

wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef, bool sel,

brcms_c_antsel_antcfg_get(struct antsel_info *asi, bool usedef, bool sel,

		      u8 antselid, u8 fbantselid, u8 *antcfg,

		      u8 *fbantcfg)

{
@@ -210,8 +211,8 @@ wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef, bool sel, 
	} else {

		ant = asi->antcfg_11n.ant_config[ANT_SELCFG_TX_UNICAST];

		if ((ant & ANT_SELCFG_AUTO) == ANT_SELCFG_AUTO) {

			*antcfg = wlc_antsel_id2antcfg(asi, antselid);

			*fbantcfg = wlc_antsel_id2antcfg(asi, fbantselid);

			*antcfg = brcms_c_antsel_id2antcfg(asi, antselid);

			*fbantcfg = brcms_c_antsel_id2antcfg(asi, fbantselid);

		} else {

			*antcfg =

			    asi->antcfg_11n.ant_config[ANT_SELCFG_TX_UNICAST];
@@ -222,7 +223,7 @@ wlc_antsel_antcfg_get(struct antsel_info *asi, bool usedef, bool sel, 
}



/* boardlevel antenna selection: convert mimo_antsel (ucode interface) to id */

u8 wlc_antsel_antsel2id(struct antsel_info *asi, u16 antsel)

u8 brcms_c_antsel_antsel2id(struct antsel_info *asi, u16 antsel)

{

	u8 antselid = 0;
@@ -241,7 +242,7 @@ u8 wlc_antsel_antsel2id(struct antsel_info *asi, u16 antsel) 
}



/* boardlevel antenna selection: convert id to ant_cfg */

static u8 wlc_antsel_id2antcfg(struct antsel_info *asi, u8 id)

static u8 brcms_c_antsel_id2antcfg(struct antsel_info *asi, u8 id)

{

	u8 antcfg = ANT_SELCFG_DEF_2x2;
@@ -260,7 +261,7 @@ static u8 wlc_antsel_id2antcfg(struct antsel_info *asi, u8 id) 
}



/* boardlevel antenna selection: convert ant_cfg to mimo_antsel (ucode interface) */

static u16 wlc_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg)

static u16 brcms_c_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg)

{

	u8 idx = WLC_ANTIDX_11N(WLC_ANTSEL_11N(ant_cfg));

	u16 mimo_antsel = 0;
@@ -280,7 +281,8 @@ static u16 wlc_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg) 
}



/* boardlevel antenna selection: ucode interface control */

static int wlc_antsel_cfgupd(struct antsel_info *asi, wlc_antselcfg_t *antsel)

static int brcms_c_antsel_cfgupd(struct antsel_info *asi,

				 wlc_antselcfg_t *antsel)

{

	struct brcms_c_info *wlc = asi->wlc;

	u8 ant_cfg;
@@ -290,7 +292,7 @@ static int wlc_antsel_cfgupd(struct antsel_info *asi, wlc_antselcfg_t *antsel) 
	 *    (aka default TX)

	 */

	ant_cfg = antsel->ant_config[ANT_SELCFG_TX_DEF];

	mimo_antsel = wlc_antsel_antcfg2antsel(asi, ant_cfg);

	mimo_antsel = brcms_c_antsel_antcfg2antsel(asi, ant_cfg);

	brcms_c_write_shm(wlc, M_MIMO_ANTSEL_TXDFLT, mimo_antsel);

	/* Update driver stats for currently selected default tx/rx antenna config */

	asi->antcfg_cur.ant_config[ANT_SELCFG_TX_DEF] = ant_cfg;
@@ -299,7 +301,7 @@ static int wlc_antsel_cfgupd(struct antsel_info *asi, wlc_antselcfg_t *antsel) 
	 *    (aka default RX)

	 */

	ant_cfg = antsel->ant_config[ANT_SELCFG_RX_DEF];

	mimo_antsel = wlc_antsel_antcfg2antsel(asi, ant_cfg);

	mimo_antsel = brcms_c_antsel_antcfg2antsel(asi, ant_cfg);

	brcms_c_write_shm(wlc, M_MIMO_ANTSEL_RXDFLT, mimo_antsel);

	/* Update driver stats for currently selected default tx/rx antenna config */

	asi->antcfg_cur.ant_config[ANT_SELCFG_RX_DEF] = ant_cfg;