aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/at76c50x-usb.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c3
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c1
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c1
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c1
6 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 0fb419936dff..7a626d4e100f 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1889,6 +1889,7 @@ static void at76_dwork_hw_scan(struct work_struct *work)
1889} 1889}
1890 1890
1891static int at76_hw_scan(struct ieee80211_hw *hw, 1891static int at76_hw_scan(struct ieee80211_hw *hw,
1892 struct ieee80211_vif *vif,
1892 struct cfg80211_scan_request *req) 1893 struct cfg80211_scan_request *req)
1893{ 1894{
1894 struct at76_priv *priv = hw->priv; 1895 struct at76_priv *priv = hw->priv;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index a0cc11ecbe93..727360944859 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -512,7 +512,9 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)
512void iwl_init_scan_params(struct iwl_priv *priv); 512void iwl_init_scan_params(struct iwl_priv *priv);
513int iwl_scan_cancel(struct iwl_priv *priv); 513int iwl_scan_cancel(struct iwl_priv *priv);
514int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); 514int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);
515int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req); 515int iwl_mac_hw_scan(struct ieee80211_hw *hw,
516 struct ieee80211_vif *vif,
517 struct cfg80211_scan_request *req);
516void iwl_internal_short_hw_scan(struct iwl_priv *priv); 518void iwl_internal_short_hw_scan(struct iwl_priv *priv);
517int iwl_force_reset(struct iwl_priv *priv, int mode); 519int iwl_force_reset(struct iwl_priv *priv, int mode);
518u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, 520u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 1bc1d29f2a07..447c3018296d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -312,7 +312,8 @@ static int iwl_scan_initiate(struct iwl_priv *priv)
312} 312}
313 313
314int iwl_mac_hw_scan(struct ieee80211_hw *hw, 314int iwl_mac_hw_scan(struct ieee80211_hw *hw,
315 struct cfg80211_scan_request *req) 315 struct ieee80211_vif *vif,
316 struct cfg80211_scan_request *req)
316{ 317{
317 struct iwl_priv *priv = hw->priv; 318 struct iwl_priv *priv = hw->priv;
318 int ret; 319 int ret;
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 79bb8833ddb9..d016933d7573 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -973,6 +973,7 @@ static void hw_scan_done(struct work_struct *work)
973} 973}
974 974
975static int mac80211_hwsim_hw_scan(struct ieee80211_hw *hw, 975static int mac80211_hwsim_hw_scan(struct ieee80211_hw *hw,
976 struct ieee80211_vif *vif,
976 struct cfg80211_scan_request *req) 977 struct cfg80211_scan_request *req)
977{ 978{
978 struct hw_scan_done *hsd = kzalloc(sizeof(*hsd), GFP_KERNEL); 979 struct hw_scan_done *hsd = kzalloc(sizeof(*hsd), GFP_KERNEL);
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 390cee7e61a1..4d3be80c220e 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -856,6 +856,7 @@ out:
856} 856}
857 857
858static int wl1251_op_hw_scan(struct ieee80211_hw *hw, 858static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
859 struct ieee80211_vif *vif,
859 struct cfg80211_scan_request *req) 860 struct cfg80211_scan_request *req)
860{ 861{
861 struct wl1251 *wl = hw->priv; 862 struct wl1251 *wl = hw->priv;
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 283d5dade1ae..08ff6447dcd9 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1523,6 +1523,7 @@ out:
1523} 1523}
1524 1524
1525static int wl1271_op_hw_scan(struct ieee80211_hw *hw, 1525static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
1526 struct ieee80211_vif *vif,
1526 struct cfg80211_scan_request *req) 1527 struct cfg80211_scan_request *req)
1527{ 1528{
1528 struct wl1271 *wl = hw->priv; 1529 struct wl1271 *wl = hw->priv;