[PATCH 1/2] fix compiler warning (return type declared as u64

Mikael Wikstrom leakim.wikstrom at gmail.com
Fri Aug 19 05:41:18 EDT 2011


but was void*)

---
 src/drivers/driver.h      |    2 +-
 wpa_supplicant/driver_i.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index e2d0f8b..649a826 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -2190,7 +2190,7 @@ struct wpa_driver_ops {
 	 * i.e., if it sets WPA_DRIVER_FLAGS_P2P_MGMT in
 	 * struct wpa_driver_capa.
 	 */
-	u64 (*p2p_sd_request)(void *priv, const u8 *dst,
+	void* (*p2p_sd_request)(void *priv, const u8 *dst,
 			      const struct wpabuf *tlvs);

 	/**
diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index 79fdddd..8619e49 100644
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -623,12 +623,12 @@ static inline int
wpa_drv_p2p_prov_disc_req(struct wpa_supplicant *wpa_s,
 						config_methods);
 }

-static inline u64 wpa_drv_p2p_sd_request(struct wpa_supplicant *wpa_s,
+static inline void* wpa_drv_p2p_sd_request(struct wpa_supplicant *wpa_s,
 					 const u8 *dst,
 					 const struct wpabuf *tlvs)
 {
 	if (!wpa_s->driver->p2p_sd_request)
-		return 0;
+		return NULL;
 	return wpa_s->driver->p2p_sd_request(wpa_s->drv_priv, dst, tlvs);
 }

-- 
1.7.4.1


More information about the HostAP mailing list