Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1e3e051 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove IEEE80211_HW_SCAN_WHILE_IDLE 



There are only a few drivers that use HW scan, and
all of those don't need a non-idle transition before
starting the scan -- some don't even care about idle
at all. Remove the flag and code associated with it.

The only driver that really actually needed this is
wl1251 and it can just do it itself in the hw_scan
callback -- implement that.

Acked-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 09b85568

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
		    IEEE80211_HW_QUEUE_CONTROL |

		    IEEE80211_HW_SUPPORTS_PS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

		    IEEE80211_HW_WANT_MONITOR_VIF |

		    IEEE80211_HW_SCAN_WHILE_IDLE;

		    IEEE80211_HW_WANT_MONITOR_VIF;



	hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;

	hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FMT;

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_REPORTS_TX_ACK_STATUS |

		    IEEE80211_HW_QUEUE_CONTROL |

		    IEEE80211_HW_WANT_MONITOR_VIF |

		    IEEE80211_HW_SCAN_WHILE_IDLE |

		    IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |

		    IEEE80211_HW_SUPPORTS_PS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

drivers/net/wireless/ti/wl1251/event.c

+5 −1
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
static int wl1251_event_scan_complete(struct wl1251 *wl,

				      struct event_mailbox *mbox)

{

	int ret = 0;



	wl1251_debug(DEBUG_EVENT, "status: 0x%x, channels: %d",

		     mbox->scheduled_scan_status,

		     mbox->scheduled_scan_channels);
@@ -37,9 +39,11 @@ static int wl1251_event_scan_complete(struct wl1251 *wl, 
		ieee80211_scan_completed(wl->hw, false);

		wl1251_debug(DEBUG_MAC80211, "mac80211 hw scan completed");

		wl->scanning = false;

		if (wl->hw->conf.flags & IEEE80211_CONF_IDLE)

			ret = wl1251_ps_set_mode(wl, STATION_IDLE);

	}



	return 0;

	return ret;

}



static void wl1251_event_mbox_dump(struct event_mailbox *mbox)

drivers/net/wireless/ti/wl1251/main.c

+19 −5
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) 
		}

	}



	if (changed & IEEE80211_CONF_CHANGE_IDLE) {

	if (changed & IEEE80211_CONF_CHANGE_IDLE && !wl->scanning) {

		if (conf->flags & IEEE80211_CONF_IDLE) {

			ret = wl1251_ps_set_mode(wl, STATION_IDLE);

			if (ret < 0)
@@ -895,11 +895,21 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw, 
	if (ret < 0)

		goto out;



	if (hw->conf.flags & IEEE80211_CONF_IDLE) {

		ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE);

		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;

	}



	skb = ieee80211_probereq_get(wl->hw, wl->vif, ssid, ssid_len,

				     req->ie_len);

	if (!skb) {

		ret = -ENOMEM;

		goto out;

		goto out_idle;

	}

	if (req->ie_len)

		memcpy(skb_put(skb, req->ie_len), req->ie, req->ie_len);
@@ -908,11 +918,11 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw, 
				      skb->len);

	dev_kfree_skb(skb);

	if (ret < 0)

		goto out_sleep;

		goto out_idle;



	ret = wl1251_cmd_trigger_scan_to(wl, 0);

	if (ret < 0)

		goto out_sleep;

		goto out_idle;



	wl->scanning = true;
@@ -920,9 +930,13 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw, 
			      req->n_channels, WL1251_SCAN_NUM_PROBES);

	if (ret < 0) {

		wl->scanning = false;

		goto out_sleep;

		goto out_idle;

	}

	goto out_sleep;



out_idle:

	if (hw->conf.flags & IEEE80211_CONF_IDLE)

		ret = wl1251_ps_set_mode(wl, STATION_IDLE);

out_sleep:

	wl1251_ps_elp_sleep(wl);

drivers/net/wireless/ti/wlcore/main.c

+0 −1
Original line number Diff line number Diff line
@@ -5636,7 +5636,6 @@ static int wl1271_init_ieee80211(struct wl1271 *wl) 
		IEEE80211_HW_AP_LINK_PS |

		IEEE80211_HW_AMPDU_AGGREGATION |

		IEEE80211_HW_TX_AMPDU_SETUP_IN_HW |

		IEEE80211_HW_SCAN_WHILE_IDLE |

		IEEE80211_HW_QUEUE_CONTROL;



	wl->hw->wiphy->cipher_suites = cipher_suites;