projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-scan.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-scan.c
b/drivers/net/wireless/iwlwifi/iwl-scan.c
index f4b897804a8072bc8b3b8e5e8e462b594a49c2d4..d12fd5553846749a9612edaff77b0ae0b3fccdc9 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-scan.c
@@
-313,7
+313,8
@@
static int iwl_scan_initiate(struct iwl_priv *priv)
}
int iwl_mac_hw_scan(struct ieee80211_hw *hw,
- struct cfg80211_scan_request *req)
+ struct ieee80211_vif *vif,
+ struct cfg80211_scan_request *req)
{
struct iwl_priv *priv = hw->priv;
int ret;