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

Commit ff9b662d authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Miscellaneous fixes 



This patch removes ath_vap_listen() and dma wrapper macros.
Also, Inline abuse is cleaned up and a few typos are fixed.

Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dc2222a8

drivers/net/wireless/ath9k/beacon.c

+26 −26
Original line number Diff line number Diff line
@@ -114,21 +114,21 @@ static void ath_beacon_setup(struct ath_softc *sc, 
	if (sc->sc_flags & SC_OP_PREAMBLE_SHORT)

		rate |= rt->info[rix].shortPreamble;



	ath9k_hw_set11n_txdesc(ah, ds

			      , skb->len + FCS_LEN /* frame length */

			      , ATH9K_PKT_TYPE_BEACON /* Atheros packet type */

			      , avp->av_btxctl.txpower /* txpower XXX */

			      , ATH9K_TXKEYIX_INVALID /* no encryption */

			      , ATH9K_KEY_TYPE_CLEAR /* no encryption */

			      , flags /* no ack, veol for beacons */

	ath9k_hw_set11n_txdesc(ah, ds,

			       skb->len + FCS_LEN, /* frame length */

			       ATH9K_PKT_TYPE_BEACON, /* Atheros packet type */

			       avp->av_btxctl.txpower, /* txpower XXX */

			       ATH9K_TXKEYIX_INVALID, /* no encryption */

			       ATH9K_KEY_TYPE_CLEAR, /* no encryption */

			       flags /* no ack, veol for beacons */

		);



	/* NB: beacon's BufLen must be a multiple of 4 bytes */

	ath9k_hw_filltxdesc(ah, ds

			   , roundup(skb->len, 4) /* buffer length */

			   , true /* first segment */

			   , true /* last segment */

			   , ds /* first descriptor */

	ath9k_hw_filltxdesc(ah, ds,

			    roundup(skb->len, 4), /* buffer length */

			    true, /* first segment */

			    true, /* last segment */

			    ds /* first descriptor */

		);



	memzero(series, sizeof(struct ath9k_11n_rate_series) * 4);
@@ -898,19 +898,19 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
			"cfp:period %u "

			"maxdur %u "

			"next %u "

			"timoffset %u\n"

			, __func__

			, (unsigned long long)tsf, tsftu

			, bs.bs_intval

			, bs.bs_nexttbtt

			, bs.bs_dtimperiod

			, bs.bs_nextdtim

			, bs.bs_bmissthreshold

			, bs.bs_sleepduration

			, bs.bs_cfpperiod

			, bs.bs_cfpmaxduration

			, bs.bs_cfpnext

			, bs.bs_timoffset

			"timoffset %u\n",

			__func__,

			(unsigned long long)tsf, tsftu,

			bs.bs_intval,

			bs.bs_nexttbtt,

			bs.bs_dtimperiod,

			bs.bs_nextdtim,

			bs.bs_bmissthreshold,

			bs.bs_sleepduration,

			bs.bs_cfpperiod,

			bs.bs_cfpmaxduration,

			bs.bs_cfpnext,

			bs.bs_timoffset

			);



		ath9k_hw_set_interrupts(ah, 0);

drivers/net/wireless/ath9k/core.c

+4 −70
Original line number Diff line number Diff line
@@ -51,10 +51,8 @@ static void bus_read_cachesize(struct ath_softc *sc, int *csz) 
 *  Set current operating mode

 *

 *  This function initializes and fills the rate table in the ATH object based

 *  on the operating mode.  The blink rates are also set up here, although

 *  they have been superceeded by the ath_led module.

 *  on the operating mode.

*/



static void ath_setcurmode(struct ath_softc *sc, enum wireless_mode mode)

{

	const struct ath9k_rate_table *rt;
@@ -232,7 +230,7 @@ static int ath_setup_channels(struct ath_softc *sc) 
 *  Determine mode from channel flags

 *

 *  This routine will provide the enumerated WIRELESSS_MODE value based

 *  on the settings of the channel flags.  If ho valid set of flags

 *  on the settings of the channel flags.  If no valid set of flags

 *  exist, the lowest mode (11b) is selected.

*/
@@ -257,7 +255,8 @@ static enum wireless_mode ath_chan2mode(struct ath9k_channel *chan) 
	else if (chan->chanmode == CHANNEL_G_HT40MINUS)

		return ATH9K_MODE_11NG_HT40MINUS;



	/* NB: should not get here */

	WARN_ON(1); /* should not get here */



	return ATH9K_MODE_11B;

}
@@ -278,8 +277,6 @@ static int ath_stop(struct ath_softc *sc) 
	/*

	 * Shutdown the hardware and driver:

	 *    stop output from above

	 *    reset 802.11 state machine

	 *      (sends station deassoc/deauth frames)

	 *    turn off timers

	 *    disable interrupts

	 *    clear transmit machinery
@@ -499,69 +496,6 @@ void ath_update_chainmask(struct ath_softc *sc, int is_ht) 
/* VAP management */

/******************/



/*

 *  VAP in Listen mode

 *

 *  This routine brings the VAP out of the down state into a "listen" state

 *  where it waits for association requests.  This is used in AP and AdHoc

 *  modes.

*/



int ath_vap_listen(struct ath_softc *sc, int if_id)

{

	struct ath_hal *ah = sc->sc_ah;

	struct ath_vap *avp;

	u32 rfilt = 0;

	DECLARE_MAC_BUF(mac);



	avp = sc->sc_vaps[if_id];

	if (avp == NULL) {

		DPRINTF(sc, ATH_DBG_FATAL, "%s: invalid interface id %u\n",

			__func__, if_id);

		return -EINVAL;

	}



#ifdef CONFIG_SLOW_ANT_DIV

	ath_slow_ant_div_stop(&sc->sc_antdiv);

#endif



	/* update ratectrl about the new state */

	ath_rate_newstate(sc, avp);



	rfilt = ath_calcrxfilter(sc);

	ath9k_hw_setrxfilter(ah, rfilt);



	if (sc->sc_ah->ah_opmode == ATH9K_M_STA ||

	    sc->sc_ah->ah_opmode == ATH9K_M_IBSS) {

		memcpy(sc->sc_curbssid, ath_bcast_mac, ETH_ALEN);

		ath9k_hw_write_associd(ah, sc->sc_curbssid, sc->sc_curaid);

	} else

		sc->sc_curaid = 0;



	DPRINTF(sc, ATH_DBG_CONFIG,

		"%s: RX filter 0x%x bssid %s aid 0x%x\n",

		__func__, rfilt, print_mac(mac,

			sc->sc_curbssid), sc->sc_curaid);



	/*

	 * XXXX

	 * Disable BMISS interrupt when we're not associated

	 */

	if (sc->sc_ah->ah_opmode == ATH9K_M_HOSTAP) {

		ath9k_hw_set_interrupts(ah, sc->sc_imask & ~ATH9K_INT_BMISS);

		sc->sc_imask &= ~ATH9K_INT_BMISS;

	} else {

		ath9k_hw_set_interrupts(

			ah,

			sc->sc_imask & ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS));

		sc->sc_imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);

	}

	/* need to reconfigure the beacons when it moves to RUN */

	sc->sc_flags &= ~SC_OP_BEACONS;



	return 0;

}



int ath_vap_attach(struct ath_softc *sc,

		   int if_id,

		   struct ieee80211_vif *if_data,

drivers/net/wireless/ath9k/core.h

+1 −5
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ struct ath_node; 
/* XXX: remove */

#define memzero(_buf, _len) memset(_buf, 0, _len)



#define get_dma_mem_context(var, field) (&((var)->field))

#define copy_dma_mem_context(dst, src)  (*dst = *src)



#define ATH9K_BH_STATUS_INTACT		0

#define ATH9K_BH_STATUS_CHANGE		1
@@ -770,7 +767,6 @@ int ath_vap_attach(struct ath_softc *sc, 
int ath_vap_detach(struct ath_softc *sc, int if_id);

int ath_vap_config(struct ath_softc *sc,

		   int if_id, struct ath_vap_config *if_config);

int ath_vap_listen(struct ath_softc *sc, int if_id);



/*********************/

/* Antenna diversity */

drivers/net/wireless/ath9k/hw.c

+34 −34
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void ath9k_hw_set_defaults(struct ath_hal *ah) 
	ah->ah_config.intr_mitigation = 0;

}



static inline void ath9k_hw_override_ini(struct ath_hal *ah,

static void ath9k_hw_override_ini(struct ath_hal *ah,

					 struct ath9k_channel *chan)

{

	if (!AR_SREV_5416_V20_OR_LATER(ah)
@@ -358,7 +358,7 @@ static inline void ath9k_hw_override_ini(struct ath_hal *ah, 
	REG_WRITE(ah, 0x9800 + (651 << 2), 0x11);

}



static inline void ath9k_hw_init_bb(struct ath_hal *ah,

static void ath9k_hw_init_bb(struct ath_hal *ah,

			     struct ath9k_channel *chan)

{

	u32 synthDelay;
@@ -374,7 +374,7 @@ static inline void ath9k_hw_init_bb(struct ath_hal *ah, 
	udelay(synthDelay + BASE_ACTIVATE_DELAY);

}



static inline void ath9k_hw_init_interrupt_masks(struct ath_hal *ah,

static void ath9k_hw_init_interrupt_masks(struct ath_hal *ah,

					  enum ath9k_opmode opmode)

{

	struct ath_hal_5416 *ahp = AH5416(ah);
@@ -405,7 +405,7 @@ static inline void ath9k_hw_init_interrupt_masks(struct ath_hal *ah, 
	}

}



static inline void ath9k_hw_init_qos(struct ath_hal *ah)

static void ath9k_hw_init_qos(struct ath_hal *ah)

{

	REG_WRITE(ah, AR_MIC_QOS_CONTROL, 0x100aa);

	REG_WRITE(ah, AR_MIC_QOS_SELECT, 0x3210);
@@ -500,7 +500,7 @@ static inline bool ath9k_hw_nvram_read(struct ath_hal *ah, 
		return ath9k_hw_eeprom_read(ah, off, data);

}



static inline bool ath9k_hw_fill_eeprom(struct ath_hal *ah)

static bool ath9k_hw_fill_eeprom(struct ath_hal *ah)

{

	struct ath_hal_5416 *ahp = AH5416(ah);

	struct ar5416_eeprom *eep = &ahp->ah_eeprom;
@@ -767,7 +767,7 @@ ath9k_hw_eeprom_set_board_values(struct ath_hal *ah, 
	return true;

}



static inline int ath9k_hw_check_eeprom(struct ath_hal *ah)

static int ath9k_hw_check_eeprom(struct ath_hal *ah)

{

	u32 sum = 0, el;

	u16 *eepdata;
@@ -1272,7 +1272,7 @@ u32 ath9k_hw_get_eeprom(struct ath_hal_5416 *ahp, 
	}

}



static inline int ath9k_hw_get_radiorev(struct ath_hal *ah)

static int ath9k_hw_get_radiorev(struct ath_hal *ah)

{

	u32 val;

	int i;
@@ -1285,7 +1285,7 @@ static inline int ath9k_hw_get_radiorev(struct ath_hal *ah) 
	return ath9k_hw_reverse_bits(val, 8);

}



static inline int ath9k_hw_init_macaddr(struct ath_hal *ah)

static int ath9k_hw_init_macaddr(struct ath_hal *ah)

{

	u32 sum;

	int i;
@@ -1367,7 +1367,7 @@ static u16 ath9k_hw_eeprom_get_spur_chan(struct ath_hal *ah, 
	return spur_val;

}



static inline int ath9k_hw_rfattach(struct ath_hal *ah)

static int ath9k_hw_rfattach(struct ath_hal *ah)

{

	bool rfStatus = false;

	int ecode = 0;
@@ -1412,7 +1412,7 @@ static int ath9k_hw_rf_claim(struct ath_hal *ah) 
	return 0;

}



static inline void ath9k_hw_init_pll(struct ath_hal *ah,

static void ath9k_hw_init_pll(struct ath_hal *ah,

			      struct ath9k_channel *chan)

{

	u32 pll;
@@ -1531,7 +1531,7 @@ static void ath9k_hw_set_operating_mode(struct ath_hal *ah, int opmode) 
	}

}



static inline void

static void

ath9k_hw_set_rfmode(struct ath_hal *ah, struct ath9k_channel *chan)

{

	u32 rfMode = 0;
@@ -1601,7 +1601,7 @@ static bool ath9k_hw_set_reset(struct ath_hal *ah, int type) 
	return true;

}



static inline bool ath9k_hw_set_reset_power_on(struct ath_hal *ah)

static bool ath9k_hw_set_reset_power_on(struct ath_hal *ah)

{

	REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |

		  AR_RTC_FORCE_WAKE_ON_INT);
@@ -1642,7 +1642,7 @@ static bool ath9k_hw_set_reset_reg(struct ath_hal *ah, 
	}

}



static inline

static

struct ath9k_channel *ath9k_hw_check_chan(struct ath_hal *ah,

					  struct ath9k_channel *chan)

{
@@ -2076,7 +2076,7 @@ static void ath9k_hw_ani_attach(struct ath_hal *ah) 
		ahp->ah_procPhyErr |= HAL_PROCESS_ANI;

}



static inline void ath9k_hw_ani_setup(struct ath_hal *ah)

static void ath9k_hw_ani_setup(struct ath_hal *ah)

{

	struct ath_hal_5416 *ahp = AH5416(ah);

	int i;
@@ -2861,7 +2861,7 @@ static u32 ath9k_hw_gpio_get(struct ath_hal *ah, u32 gpio) 
	}

}



static inline int ath9k_hw_post_attach(struct ath_hal *ah)

static int ath9k_hw_post_attach(struct ath_hal *ah)

{

	int ecode;
@@ -3573,7 +3573,7 @@ static inline bool ath9k_hw_fill_vpd_table(u8 pwrMin, 
	return true;

}



static inline void

static void

ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hal *ah,

				    struct ath9k_channel *chan,

				    struct cal_data_per_freq *pRawDataSet,
@@ -3755,7 +3755,7 @@ ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hal *ah, 
	return;

}



static inline bool

static bool

ath9k_hw_set_power_cal_table(struct ath_hal *ah,

			     struct ar5416_eeprom *pEepData,

			     struct ath9k_channel *chan,
@@ -3958,7 +3958,7 @@ void ath9k_hw_configpcipowersave(struct ath_hal *ah, int restore) 
	}

}



static inline void

static void

ath9k_hw_get_legacy_target_powers(struct ath_hal *ah,

				  struct ath9k_channel *chan,

				  struct cal_target_power_leg *powInfo,
@@ -4024,7 +4024,7 @@ ath9k_hw_get_legacy_target_powers(struct ath_hal *ah, 
	}

}



static inline void

static void

ath9k_hw_get_target_powers(struct ath_hal *ah,

			   struct ath9k_channel *chan,

			   struct cal_target_power_ht *powInfo,
@@ -4091,7 +4091,7 @@ ath9k_hw_get_target_powers(struct ath_hal *ah, 
	}

}



static inline u16

static u16

ath9k_hw_get_max_edge_power(u16 freq,

			    struct cal_ctl_edges *pRdEdgesPower,

			    bool is2GHz)
@@ -4121,7 +4121,7 @@ ath9k_hw_get_max_edge_power(u16 freq, 
	return twiceMaxEdgePower;

}



static inline bool

static bool

ath9k_hw_set_power_per_rate_table(struct ath_hal *ah,

				  struct ar5416_eeprom *pEepData,

				  struct ath9k_channel *chan,
@@ -5100,7 +5100,7 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah, 
	REG_WRITE(ah, AR_PHY_MASK2_P_61_45, tmp_mask);

}



static inline void ath9k_hw_init_chain_masks(struct ath_hal *ah)

static void ath9k_hw_init_chain_masks(struct ath_hal *ah)

{

	struct ath_hal_5416 *ahp = AH5416(ah);

	int rx_chainmask, tx_chainmask;
@@ -5304,7 +5304,7 @@ bool ath9k_hw_setslottime(struct ath_hal *ah, u32 us) 
	}

}



static inline void ath9k_hw_init_user_settings(struct ath_hal *ah)

static void ath9k_hw_init_user_settings(struct ath_hal *ah)

{

	struct ath_hal_5416 *ahp = AH5416(ah);
@@ -5323,7 +5323,7 @@ static inline void ath9k_hw_init_user_settings(struct ath_hal *ah) 
		ath9k_hw_set_global_txtimeout(ah, ahp->ah_globaltxtimeout);

}



static inline int

static int

ath9k_hw_process_ini(struct ath_hal *ah,

		     struct ath9k_channel *chan,

		     enum ath9k_ht_macmode macmode)
@@ -5454,7 +5454,7 @@ ath9k_hw_process_ini(struct ath_hal *ah, 
	return 0;

}



static inline void ath9k_hw_setup_calibration(struct ath_hal *ah,

static void ath9k_hw_setup_calibration(struct ath_hal *ah,

					      struct hal_cal_list *currCal)

{

	REG_RMW_FIELD(ah, AR_PHY_TIMING_CTRL4(0),
@@ -5490,7 +5490,7 @@ static inline void ath9k_hw_setup_calibration(struct ath_hal *ah, 
		    AR_PHY_TIMING_CTRL4_DO_CAL);

}



static inline void ath9k_hw_reset_calibration(struct ath_hal *ah,

static void ath9k_hw_reset_calibration(struct ath_hal *ah,

				       struct hal_cal_list *currCal)

{

	struct ath_hal_5416 *ahp = AH5416(ah);
@@ -5510,7 +5510,7 @@ static inline void ath9k_hw_reset_calibration(struct ath_hal *ah, 
	ahp->ah_CalSamples = 0;

}



static inline void

static void

ath9k_hw_per_calibration(struct ath_hal *ah,

			 struct ath9k_channel *ichan,

			 u8 rxchainmask,
@@ -5600,7 +5600,7 @@ static inline bool ath9k_hw_run_init_cals(struct ath_hal *ah, 
	return true;

}



static inline bool

static bool

ath9k_hw_channel_change(struct ath_hal *ah,

			struct ath9k_channel *chan,

			enum ath9k_ht_macmode macmode)
@@ -5777,7 +5777,7 @@ static bool ath9k_hw_iscal_supported(struct ath_hal *ah, 
	return retval;

}



static inline bool ath9k_hw_init_cal(struct ath_hal *ah,

static bool ath9k_hw_init_cal(struct ath_hal *ah,

			      struct ath9k_channel *chan)

{

	struct ath_hal_5416 *ahp = AH5416(ah);

drivers/net/wireless/ath9k/main.c

+3 −16
Original line number Diff line number Diff line
@@ -212,12 +212,10 @@ static int ath_key_config(struct ath_softc *sc, 


static void ath_key_delete(struct ath_softc *sc, struct ieee80211_key_conf *key)

{

#define ATH_MAX_NUM_KEYS 4

	int freeslot;



	freeslot = (key->keyidx >= ATH_MAX_NUM_KEYS) ? 1 : 0;

	freeslot = (key->keyidx >= 4) ? 1 : 0;

	ath_key_reset(sc, key->keyidx, freeslot);

#undef ATH_MAX_NUM_KEYS

}



static void setup_ht_cap(struct ieee80211_ht_info *ht_info)
@@ -620,7 +618,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw, 
	}



	if ((conf->changed & IEEE80211_IFCC_BEACON) &&

	    (vif->type == IEEE80211_IF_TYPE_IBSS)) {

	    ((vif->type == IEEE80211_IF_TYPE_IBSS) ||

	     (vif->type == IEEE80211_IF_TYPE_AP))) {

		/*

		 * Allocate and setup the beacon frame.

		 *
@@ -638,18 +637,6 @@ static int ath9k_config_interface(struct ieee80211_hw *hw, 
		ath_beacon_sync(sc, 0);

	}



	if ((conf->changed & IEEE80211_IFCC_BEACON) &&

	    (vif->type == IEEE80211_IF_TYPE_AP)) {

		ath9k_hw_stoptxdma(sc->sc_ah, sc->sc_bhalq);



		error = ath_beacon_alloc(sc, 0);

		if (error != 0)

			return error;



		ath_beacon_config(sc, 0);

		sc->sc_flags |= SC_OP_BEACONS;

	}



	/* Check for WLAN_CAPABILITY_PRIVACY ? */

	if ((avp->av_opmode != IEEE80211_IF_TYPE_STA)) {

		for (i = 0; i < IEEE80211_WEP_NKID; i++)