Commit 9b44350b authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho

wl12xx: delete wl->vif (and allow multiple vifs)

Delete the global wl->vif (and the checks on it),
so multiple vifs could be added.
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 3dee4393
...@@ -2186,13 +2186,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, ...@@ -2186,13 +2186,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
if (ret < 0) if (ret < 0)
goto out_unlock; goto out_unlock;
if (wl->vif) {
wl1271_debug(DEBUG_MAC80211,
"multiple vifs are not supported yet");
ret = -EBUSY;
goto out;
}
/* /*
* in some very corner case HW recovery scenarios its possible to * in some very corner case HW recovery scenarios its possible to
* get here before __wl1271_op_remove_interface is complete, so * get here before __wl1271_op_remove_interface is complete, so
...@@ -2265,7 +2258,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, ...@@ -2265,7 +2258,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
if (ret < 0) if (ret < 0)
goto out; goto out;
wl->vif = vif;
list_add(&wlvif->list, &wl->wlvif_list); list_add(&wlvif->list, &wl->wlvif_list);
set_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags); set_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags);
...@@ -2298,8 +2290,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl, ...@@ -2298,8 +2290,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
return; return;
wl->vif = NULL;
/* because of hardware recovery, we may get here twice */ /* because of hardware recovery, we may get here twice */
if (wl->state != WL1271_STATE_ON) if (wl->state != WL1271_STATE_ON)
return; return;
...@@ -5291,7 +5281,6 @@ static struct ieee80211_hw *wl1271_alloc_hw(void) ...@@ -5291,7 +5281,6 @@ static struct ieee80211_hw *wl1271_alloc_hw(void)
wl->rx_counter = 0; wl->rx_counter = 0;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL; wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
wl->band = IEEE80211_BAND_2GHZ; wl->band = IEEE80211_BAND_2GHZ;
wl->vif = NULL;
wl->flags = 0; wl->flags = 0;
wl->sg_enabled = true; wl->sg_enabled = true;
wl->hw_pg_ver = -1; wl->hw_pg_ver = -1;
......
...@@ -445,8 +445,6 @@ struct wl1271 { ...@@ -445,8 +445,6 @@ struct wl1271 {
struct wl12xx_fw_status *fw_status; struct wl12xx_fw_status *fw_status;
struct wl1271_tx_hw_res_if *tx_res_if; struct wl1271_tx_hw_res_if *tx_res_if;
struct ieee80211_vif *vif;
/* Current chipset configuration */ /* Current chipset configuration */
struct conf_drv_settings conf; struct conf_drv_settings conf;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment