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

Commit a060bbfe authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: give virtual interface to hw_scan 



When scanning, it is somewhat important to scan
on the correct virtual interface. All drivers
that currently implement hw_scan only support a
single virtual interface, but that may change
and then we'd want to be ready.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9043f3b8

drivers/net/wireless/at76c50x-usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1889,6 +1889,7 @@ static void at76_dwork_hw_scan(struct work_struct *work) 
}



static int at76_hw_scan(struct ieee80211_hw *hw,

			struct ieee80211_vif *vif,

			struct cfg80211_scan_request *req)

{

	struct at76_priv *priv = hw->priv;

drivers/net/wireless/iwlwifi/iwl-core.h

+3 −1
Original line number Diff line number Diff line
@@ -512,7 +512,9 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags) 
void iwl_init_scan_params(struct iwl_priv *priv);

int iwl_scan_cancel(struct iwl_priv *priv);

int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req);

int iwl_mac_hw_scan(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    struct cfg80211_scan_request *req);

void iwl_internal_short_hw_scan(struct iwl_priv *priv);

int iwl_force_reset(struct iwl_priv *priv, int mode);

u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,

drivers/net/wireless/iwlwifi/iwl-scan.c

+2 −1
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ static int iwl_scan_initiate(struct iwl_priv *priv) 
}



int iwl_mac_hw_scan(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    struct cfg80211_scan_request *req)

{

	struct iwl_priv *priv = hw->priv;

drivers/net/wireless/mac80211_hwsim.c

+1 −0
Original line number Diff line number Diff line
@@ -973,6 +973,7 @@ static void hw_scan_done(struct work_struct *work) 
}



static int mac80211_hwsim_hw_scan(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				  struct cfg80211_scan_request *req)

{

	struct hw_scan_done *hsd = kzalloc(sizeof(*hsd), GFP_KERNEL);

drivers/net/wireless/wl12xx/wl1251_main.c

+1 −0
Original line number Diff line number Diff line
@@ -856,6 +856,7 @@ static int wl1251_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
}



static int wl1251_op_hw_scan(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif,

			     struct cfg80211_scan_request *req)

{

	struct wl1251 *wl = hw->priv;