From b375191c61da7f1cf74ce72d47364d76d4149a7d Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <andrew.zaborowski@intel.com>
Date: Tue, 4 Dec 2018 03:44:35 +0100
Subject: [PATCH] scan: Drop the wiphy_id scan callback parameter

---
 src/scan.c    | 5 ++---
 src/scan.h    | 2 +-
 src/station.c | 9 ++++-----
 src/wsc.c     | 6 +++---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/scan.c b/src/scan.c
index 65159e34..f3f7b572 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -139,7 +139,7 @@ static void scan_request_failed(struct scan_context *sc,
 	if (sr->trigger)
 		sr->trigger(err, sr->userdata);
 	else if (sr->callback)
-		sr->callback(0, sc->ifindex, err, NULL, sr->userdata);
+		sr->callback(sc->ifindex, err, NULL, sr->userdata);
 
 	scan_request_free(sr);
 }
@@ -1172,8 +1172,7 @@ static void scan_finished(struct scan_context *sc, uint32_t wiphy,
 	}
 
 	if (callback)
-		new_owner = callback(wiphy, sc->ifindex, err,
-					bss_list, userdata);
+		new_owner = callback(sc->ifindex, err, bss_list, userdata);
 
 	if (sr)
 		scan_request_free(sr);
diff --git a/src/scan.h b/src/scan.h
index a5685ee9..c47cbf7a 100644
--- a/src/scan.h
+++ b/src/scan.h
@@ -33,7 +33,7 @@ enum scan_state {
 
 typedef void (*scan_func_t)(struct l_genl_msg *msg, void *user_data);
 typedef void (*scan_trigger_func_t)(int, void *);
-typedef bool (*scan_notify_func_t)(uint32_t wiphy, uint32_t ifindex, int err,
+typedef bool (*scan_notify_func_t)(uint32_t ifindex, int err,
 					struct l_queue *bss_list,
 					void *userdata);
 typedef void (*scan_destroy_func_t)(void *userdata);
diff --git a/src/station.c b/src/station.c
index e22b1200..954bb84b 100644
--- a/src/station.c
+++ b/src/station.c
@@ -564,7 +564,7 @@ not_supported:
 	return NULL;
 }
 
-static bool new_scan_results(uint32_t wiphy_id, uint32_t ifindex, int err,
+static bool new_scan_results(uint32_t ifindex, int err,
 				struct l_queue *bss_list, void *userdata)
 {
 	struct station *station = userdata;
@@ -1041,8 +1041,8 @@ static void station_roam_scan_triggered(int err, void *user_data)
 	 */
 }
 
-static bool station_roam_scan_notify(uint32_t wiphy_id, uint32_t ifindex,
-					int err, struct l_queue *bss_list,
+static bool station_roam_scan_notify(uint32_t ifindex, int err,
+					struct l_queue *bss_list,
 					void *userdata)
 {
 	struct station *station = userdata;
@@ -1678,8 +1678,7 @@ static void station_hidden_network_scan_triggered(int err, void *user_data)
 				dbus_error_failed(station->connect_pending));
 }
 
-static bool station_hidden_network_scan_results(uint32_t wiphy_id,
-						uint32_t ifindex, int err,
+static bool station_hidden_network_scan_results(uint32_t ifindex, int err,
 						struct l_queue *bss_list,
 						void *userdata)
 {
diff --git a/src/wsc.c b/src/wsc.c
index b196748c..3fc1bcc4 100644
--- a/src/wsc.c
+++ b/src/wsc.c
@@ -560,8 +560,8 @@ static void pin_timeout(struct l_timeout *timeout, void *user_data)
 					wsc_error_time_expired(wsc->pending));
 }
 
-static bool push_button_scan_results(uint32_t wiphy_id, uint32_t ifindex,
-					int err, struct l_queue *bss_list,
+static bool push_button_scan_results(uint32_t ifindex, int err,
+					struct l_queue *bss_list,
 					void *userdata)
 {
 	struct wsc *wsc = userdata;
@@ -718,7 +718,7 @@ static bool authorized_macs_contains(const uint8_t *authorized_macs,
 	return false;
 }
 
-static bool pin_scan_results(uint32_t wiphy_id, uint32_t ifindex, int err,
+static bool pin_scan_results(uint32_t ifindex, int err,
 				struct l_queue *bss_list, void *userdata)
 {
 	static const uint8_t wildcard_address[] =