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

Commit 7545daf4 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: remove support for virtual wiphys 



Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 34302397

drivers/net/wireless/ath/ath9k/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ ath9k-y += beacon.o \ 
		main.o \

		recv.o \

		xmit.o \

		virtual.o \



ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o

ath9k-$(CONFIG_PCI) += pci.o

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

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	sc = (struct ath_softc *) (aphy + 1);

	aphy->sc = sc;

	aphy->hw = hw;

	sc->pri_wiphy = aphy;

	sc->hw = hw;

	sc->dev = &pdev->dev;

	sc->mem = mem;

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −41
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ struct ath_beacon { 
	u32 ast_be_xmit;

	u64 bc_tstamp;

	struct ieee80211_vif *bslot[ATH_BCBUF];

	struct ath_wiphy *bslot_aphy[ATH_BCBUF];

	int slottime;

	int slotupdate;

	struct ath9k_tx_queue_info beacon_qi;
@@ -585,20 +584,8 @@ struct ath_softc { 
	struct ieee80211_hw *hw;

	struct device *dev;



	spinlock_t wiphy_lock; /* spinlock to protect ath_wiphy data */

	struct ath_wiphy *pri_wiphy;

	struct ath_wiphy **sec_wiphy; /* secondary wiphys (virtual radios); may

				       * have NULL entries */

	int num_sec_wiphy; /* number of sec_wiphy pointers in the array */

	int chan_idx;

	int chan_is_ht;

	struct ath_wiphy *next_wiphy;

	struct work_struct chan_work;

	int wiphy_select_failures;

	unsigned long wiphy_select_first_fail;

	struct delayed_work wiphy_work;

	unsigned long wiphy_scheduler_int;

	int wiphy_scheduler_index;

	struct survey_info *cur_survey;

	struct survey_info survey[ATH9K_NUM_CHANNELS];
@@ -665,16 +652,6 @@ struct ath_wiphy { 
	struct ath_softc *sc; /* shared for all virtual wiphys */

	struct ieee80211_hw *hw;

	struct ath9k_hw_cal_data caldata;

	enum ath_wiphy_state {

		ATH_WIPHY_INACTIVE,

		ATH_WIPHY_ACTIVE,

		ATH_WIPHY_PAUSING,

		ATH_WIPHY_PAUSED,

		ATH_WIPHY_SCAN,

	} state;

	bool idle;

	int chan_idx;

	int chan_is_ht;

	int last_rssi;

};
@@ -731,24 +708,6 @@ void ath9k_ps_restore(struct ath_softc *sc); 
u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate);



void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);

int ath9k_wiphy_add(struct ath_softc *sc);

int ath9k_wiphy_del(struct ath_wiphy *aphy);

void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, int ftype);

int ath9k_wiphy_pause(struct ath_wiphy *aphy);

int ath9k_wiphy_unpause(struct ath_wiphy *aphy);

int ath9k_wiphy_select(struct ath_wiphy *aphy);

void ath9k_wiphy_set_scheduler(struct ath_softc *sc, unsigned int msec_int);

void ath9k_wiphy_chan_work(struct work_struct *work);

bool ath9k_wiphy_started(struct ath_softc *sc);

void ath9k_wiphy_pause_all_forced(struct ath_softc *sc,

				  struct ath_wiphy *selected);

bool ath9k_wiphy_scanning(struct ath_softc *sc);

void ath9k_wiphy_work(struct work_struct *work);

bool ath9k_all_wiphys_idle(struct ath_softc *sc);

void ath9k_set_wiphy_idle(struct ath_wiphy *aphy, bool idle);



void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue);

bool ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);



void ath_start_rfkill_poll(struct ath_softc *sc);

extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);

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

+1 −8
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, 
	struct ieee80211_tx_info *info;

	int cabq_depth;



	if (aphy->state != ATH_WIPHY_ACTIVE)

		return NULL;



	avp = (void *)vif->drv_priv;

	cabq = sc->beacon.cabq;
@@ -261,7 +258,6 @@ int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif) 
				}

			BUG_ON(sc->beacon.bslot[avp->av_bslot] != NULL);

			sc->beacon.bslot[avp->av_bslot] = vif;

			sc->beacon.bslot_aphy[avp->av_bslot] = aphy;

			sc->nbcnvifs++;

		}

	}
@@ -332,7 +328,6 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp) 


		if (avp->av_bslot != -1) {

			sc->beacon.bslot[avp->av_bslot] = NULL;

			sc->beacon.bslot_aphy[avp->av_bslot] = NULL;

			sc->nbcnvifs--;

		}
@@ -358,7 +353,6 @@ void ath_beacon_tasklet(unsigned long data) 
	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_buf *bf = NULL;

	struct ieee80211_vif *vif;

	struct ath_wiphy *aphy;

	int slot;

	u32 bfaddr, bc = 0, tsftu;

	u64 tsf;
@@ -416,7 +410,6 @@ void ath_beacon_tasklet(unsigned long data) 
	 */

	slot = ATH_BCBUF - slot - 1;

	vif = sc->beacon.bslot[slot];

	aphy = sc->beacon.bslot_aphy[slot];



	ath_dbg(common, ATH_DBG_BEACON,

		"slot %d [tsf %llu tsftu %u intval %u] vif %p\n",
@@ -424,7 +417,7 @@ void ath_beacon_tasklet(unsigned long data) 


	bfaddr = 0;

	if (vif) {

		bf = ath_beacon_generate(aphy->hw, vif);

		bf = ath_beacon_generate(sc->hw, vif);

		if (bf != NULL) {

			bfaddr = bf->bf_daddr;

			bc = 1;

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

+1 −18
Original line number Diff line number Diff line
@@ -517,10 +517,8 @@ static void ath9k_init_misc(struct ath_softc *sc) 


	sc->beacon.slottime = ATH9K_SLOT_TIME_9;



	for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) {

	for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++)

		sc->beacon.bslot[i] = NULL;

		sc->beacon.bslot_aphy[i] = NULL;

	}



	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB)

		sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT;
@@ -556,7 +554,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	common->btcoex_enabled = ath9k_btcoex_enable == 1;

	spin_lock_init(&common->cc_lock);



	spin_lock_init(&sc->wiphy_lock);

	spin_lock_init(&sc->sc_serial_rw);

	spin_lock_init(&sc->sc_pm_lock);

	mutex_init(&sc->mutex);
@@ -762,9 +759,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, 


	INIT_WORK(&sc->hw_check_work, ath_hw_check);

	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);

	INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);

	INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);

	sc->wiphy_scheduler_int = msecs_to_jiffies(500);

	aphy->last_rssi = ATH_RSSI_DUMMY_MARKER;



	ath_init_leds(sc);
@@ -823,28 +817,17 @@ static void ath9k_deinit_softc(struct ath_softc *sc) 
void ath9k_deinit_device(struct ath_softc *sc)

{

	struct ieee80211_hw *hw = sc->hw;

	int i = 0;



	ath9k_ps_wakeup(sc);



	wiphy_rfkill_stop_polling(sc->hw->wiphy);

	ath_deinit_leds(sc);



	for (i = 0; i < sc->num_sec_wiphy; i++) {

		struct ath_wiphy *aphy = sc->sec_wiphy[i];

		if (aphy == NULL)

			continue;

		sc->sec_wiphy[i] = NULL;

		ieee80211_unregister_hw(aphy->hw);

		ieee80211_free_hw(aphy->hw);

	}



	ieee80211_unregister_hw(hw);

	pm_qos_remove_request(&sc->pm_qos_req);

	ath_rx_cleanup(sc);

	ath_tx_cleanup(sc);

	ath9k_deinit_softc(sc);

	kfree(sc->sec_wiphy);

}



void ath_descdma_cleanup(struct ath_softc *sc,