ath9k: move ath9k_beacon_config_adhoc to common (4c9a1f32) · Commits · 戴 / test

drivers/net/wireless/ath/ath9k/beacon.c

+2 −19

Original line number	Diff line number	Diff line
		@@ -526,29 +526,12 @@ static void ath9k_beacon_config_adhoc(struct ath_softc *sc,
		{
		struct ath_hw *ah = sc->sc_ah;
		struct ath_common *common = ath9k_hw_common(ah);
		u32 intval, nexttbtt;

		ath9k_reset_beacon_status(sc);

		intval = TU_TO_USEC(conf->beacon_interval);

		if (conf->ibss_creator)
		nexttbtt = intval;
		else
		nexttbtt = ath9k_get_next_tbtt(sc, ath9k_hw_gettsf64(ah),
		conf->beacon_interval);

		if (conf->enable_beacon)
		ah->imask \|= ATH9K_INT_SWBA;
		else
		ah->imask &= ~ATH9K_INT_SWBA;

		ath_dbg(common, BEACON,
		"IBSS (%s) nexttbtt: %u intval: %u conf_intval: %u\n",
		(conf->enable_beacon) ? "Enable" : "Disable",
		nexttbtt, intval, conf->beacon_interval);
		ath9k_cmn_beacon_config_adhoc(ah, conf);

		ath9k_beacon_init(sc, nexttbtt, intval, conf->ibss_creator);
		ath9k_beacon_init(sc, conf->nexttbtt, conf->intval, conf->ibss_creator);

		/*
		* Set the global 'beacon has been configured' flag for the

+25 −0

Original line number	Diff line number	Diff line
		@@ -124,3 +124,28 @@ int ath9k_cmn_beacon_config_sta(struct ath_hw *ah,
		return 0;
		}
		EXPORT_SYMBOL(ath9k_cmn_beacon_config_sta);

		void ath9k_cmn_beacon_config_adhoc(struct ath_hw *ah,
		struct ath_beacon_config *conf)
		{
		struct ath_common *common = ath9k_hw_common(ah);

		conf->intval = TU_TO_USEC(conf->beacon_interval);

		if (conf->ibss_creator)
		conf->nexttbtt = conf->intval;
		else
		conf->nexttbtt = ath9k_get_next_tbtt(ah, ath9k_hw_gettsf64(ah),
		conf->beacon_interval);

		if (conf->enable_beacon)
		ah->imask \|= ATH9K_INT_SWBA;
		else
		ah->imask &= ~ATH9K_INT_SWBA;

		ath_dbg(common, BEACON,
		"IBSS (%s) nexttbtt: %u intval: %u conf_intval: %u\n",
		(conf->enable_beacon) ? "Enable" : "Disable",
		conf->nexttbtt, conf->intval, conf->beacon_interval);
		}
		EXPORT_SYMBOL(ath9k_cmn_beacon_config_adhoc);

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,3 +19,5 @@ struct ath_beacon_config;
		int ath9k_cmn_beacon_config_sta(struct ath_hw *ah,
		struct ath_beacon_config *conf,
		struct ath9k_beacon_state *bs);
		void ath9k_cmn_beacon_config_adhoc(struct ath_hw *ah,
		struct ath_beacon_config *conf);