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

Commit 96f99d3d authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville
Browse files

ath9k_htc: Remove interface combination specific checks 



Once the driver advertizes interface combination logic
based on its firmware/hardware limitation, cfg80211
takes care of all the necessary logic such as maximum
beaconing vifs, standlone interface etc.

Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8b0b6be5

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

+0 −20
Original line number Diff line number Diff line
@@ -1036,26 +1036,6 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, 


	mutex_lock(&priv->mutex);



	if (priv->nvifs >= ATH9K_HTC_MAX_VIF) {

		mutex_unlock(&priv->mutex);

		return -ENOBUFS;

	}



	if (priv->num_ibss_vif ||

	    (priv->nvifs && vif->type == NL80211_IFTYPE_ADHOC)) {

		ath_err(common, "IBSS coexistence with other modes is not allowed\n");

		mutex_unlock(&priv->mutex);

		return -ENOBUFS;

	}



	if (((vif->type == NL80211_IFTYPE_AP) ||

	     (vif->type == NL80211_IFTYPE_ADHOC)) &&

	    ((priv->num_ap_vif + priv->num_ibss_vif) >= ATH9K_HTC_MAX_BCN_VIF)) {

		ath_err(common, "Max. number of beaconing interfaces reached\n");

		mutex_unlock(&priv->mutex);

		return -ENOBUFS;

	}



	ath9k_htc_ps_wakeup(priv);

	memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif));

	memcpy(&hvif.myaddr, vif->addr, ETH_ALEN);