diff options
author | Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com> | 2012-10-08 12:00:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 15:18:51 -0400 |
commit | 96f99d3db736ad0ac275bfec6f83240b1b3019ec (patch) | |
tree | 494475ffa6b5c4b680e06bcc0ab4cbaac21cf9fb | |
parent | 8b0b6be5cb83e871adf8a134e843c01d75b1d128 (diff) |
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: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index ca78e33ca23e..66f6a74c508e 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c | |||
@@ -1036,26 +1036,6 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, | |||
1036 | 1036 | ||
1037 | mutex_lock(&priv->mutex); | 1037 | mutex_lock(&priv->mutex); |
1038 | 1038 | ||
1039 | if (priv->nvifs >= ATH9K_HTC_MAX_VIF) { | ||
1040 | mutex_unlock(&priv->mutex); | ||
1041 | return -ENOBUFS; | ||
1042 | } | ||
1043 | |||
1044 | if (priv->num_ibss_vif || | ||
1045 | (priv->nvifs && vif->type == NL80211_IFTYPE_ADHOC)) { | ||
1046 | ath_err(common, "IBSS coexistence with other modes is not allowed\n"); | ||
1047 | mutex_unlock(&priv->mutex); | ||
1048 | return -ENOBUFS; | ||
1049 | } | ||
1050 | |||
1051 | if (((vif->type == NL80211_IFTYPE_AP) || | ||
1052 | (vif->type == NL80211_IFTYPE_ADHOC)) && | ||
1053 | ((priv->num_ap_vif + priv->num_ibss_vif) >= ATH9K_HTC_MAX_BCN_VIF)) { | ||
1054 | ath_err(common, "Max. number of beaconing interfaces reached\n"); | ||
1055 | mutex_unlock(&priv->mutex); | ||
1056 | return -ENOBUFS; | ||
1057 | } | ||
1058 | |||
1059 | ath9k_htc_ps_wakeup(priv); | 1039 | ath9k_htc_ps_wakeup(priv); |
1060 | memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif)); | 1040 | memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif)); |
1061 | memcpy(&hvif.myaddr, vif->addr, ETH_ALEN); | 1041 | memcpy(&hvif.myaddr, vif->addr, ETH_ALEN); |