aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2012-03-04 03:55:45 -0500
committerLuciano Coelho <coelho@ti.com>2012-03-05 08:45:24 -0500
commit349345a4ec631cd98767b58b065535dd2278697c (patch)
tree004e194192634114c45aa083077a1dec23680aaa /drivers/net/wireless/wl12xx
parentd7b63b9fc7ee73e75a4c7fdb899a7c43ded7d25f (diff)
wl12xx: don't start dev role on ibss vifs
device role is used for scanning and sending packets before connection. however, since we don't need to send packets before ibss creation, there is no need to start the device on idle-off. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r--drivers/net/wireless/wl12xx/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 418b2b82c185..93636ea84dae 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3746,10 +3746,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
3746 ibss_joined = true; 3746 ibss_joined = true;
3747 } else { 3747 } else {
3748 if (test_and_clear_bit(WLVIF_FLAG_IBSS_JOINED, 3748 if (test_and_clear_bit(WLVIF_FLAG_IBSS_JOINED,
3749 &wlvif->flags)) { 3749 &wlvif->flags))
3750 wl1271_unjoin(wl, wlvif); 3750 wl1271_unjoin(wl, wlvif);
3751 wl12xx_start_dev(wl, wlvif);
3752 }
3753 } 3751 }
3754 } 3752 }
3755 3753
@@ -3767,7 +3765,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
3767 do_join = true; 3765 do_join = true;
3768 } 3766 }
3769 3767
3770 if (changed & BSS_CHANGED_IDLE) { 3768 if (changed & BSS_CHANGED_IDLE && !is_ibss) {
3771 ret = wl1271_sta_handle_idle(wl, wlvif, bss_conf->idle); 3769 ret = wl1271_sta_handle_idle(wl, wlvif, bss_conf->idle);
3772 if (ret < 0) 3770 if (ret < 0)
3773 wl1271_warning("idle mode change failed %d", ret); 3771 wl1271_warning("idle mode change failed %d", ret);