From 874c7e69270485fac8f1558bd525223868352c99 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Fri, 18 Apr 2014 03:47:00 +0300 Subject: [PATCH 1/1] wl1251: avoid redundant join commands --- drivers/net/wireless/wl1251/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c index 68c9743b4936..243d8d8091d1 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/drivers/net/wireless/wl1251/main.c @@ -1194,6 +1194,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, { struct wl1251 *wl = hw->priv; struct sk_buff *beacon, *skb; + bool do_join = false; bool enable; int ret; @@ -1228,10 +1229,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, if (ret < 0) goto out_sleep; - ret = wl1251_join(wl, wl->bss_type, wl->channel, - wl->beacon_int, wl->dtim_period); - if (ret < 0) - goto out_sleep; + do_join = true; } } @@ -1323,9 +1321,12 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, if (ret < 0) goto out_sleep; + do_join = true; + } + + if (do_join) { ret = wl1251_join(wl, wl->bss_type, wl->channel, wl->beacon_int, wl->dtim_period); - if (ret < 0) goto out_sleep; } -- 2.39.2