diff options
author | Eliad Peller <eliad@wizery.com> | 2012-02-06 05:47:57 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-02-15 01:38:36 -0500 |
commit | 9b44350b495a6ec94f59073c5a4e09e80a818304 (patch) | |
tree | 461f1862d6926957e947384cff5cb56aa4c8e337 /drivers/net/wireless/wl12xx/main.c | |
parent | 3dee43930fb48a0746621c99d46318aad8169980 (diff) |
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: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 10c1ecdf9bab..fc8dfbfe1d89 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -2186,13 +2186,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, | |||
2186 | if (ret < 0) | 2186 | if (ret < 0) |
2187 | goto out_unlock; | 2187 | goto out_unlock; |
2188 | 2188 | ||
2189 | if (wl->vif) { | ||
2190 | wl1271_debug(DEBUG_MAC80211, | ||
2191 | "multiple vifs are not supported yet"); | ||
2192 | ret = -EBUSY; | ||
2193 | goto out; | ||
2194 | } | ||
2195 | |||
2196 | /* | 2189 | /* |
2197 | * in some very corner case HW recovery scenarios its possible to | 2190 | * in some very corner case HW recovery scenarios its possible to |
2198 | * get here before __wl1271_op_remove_interface is complete, so | 2191 | * 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 | if (ret < 0) | 2258 | if (ret < 0) |
2266 | goto out; | 2259 | goto out; |
2267 | 2260 | ||
2268 | wl->vif = vif; | ||
2269 | list_add(&wlvif->list, &wl->wlvif_list); | 2261 | list_add(&wlvif->list, &wl->wlvif_list); |
2270 | set_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags); | 2262 | set_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags); |
2271 | 2263 | ||
@@ -2298,8 +2290,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl, | |||
2298 | if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) | 2290 | if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) |
2299 | return; | 2291 | return; |
2300 | 2292 | ||
2301 | wl->vif = NULL; | ||
2302 | |||
2303 | /* because of hardware recovery, we may get here twice */ | 2293 | /* because of hardware recovery, we may get here twice */ |
2304 | if (wl->state != WL1271_STATE_ON) | 2294 | if (wl->state != WL1271_STATE_ON) |
2305 | return; | 2295 | return; |
@@ -5291,7 +5281,6 @@ static struct ieee80211_hw *wl1271_alloc_hw(void) | |||
5291 | wl->rx_counter = 0; | 5281 | wl->rx_counter = 0; |
5292 | wl->power_level = WL1271_DEFAULT_POWER_LEVEL; | 5282 | wl->power_level = WL1271_DEFAULT_POWER_LEVEL; |
5293 | wl->band = IEEE80211_BAND_2GHZ; | 5283 | wl->band = IEEE80211_BAND_2GHZ; |
5294 | wl->vif = NULL; | ||
5295 | wl->flags = 0; | 5284 | wl->flags = 0; |
5296 | wl->sg_enabled = true; | 5285 | wl->sg_enabled = true; |
5297 | wl->hw_pg_ver = -1; | 5286 | wl->hw_pg_ver = -1; |