Skip to contentSkip to conversation

hostap: Fix sparse warnings

PATCH Superseded Larry Finger 3 participants 5 messages Oct 16, 2008 – Oct 19, 2008 Networking drivers (wireless)

lore
Share & tools
lore

Larry Finger

author
#0 lore raw

PATCH 1/1 hostap: Fix sparse warnings

A compilation with the command "make C=2 CF="-D__CHECK_ENDIAN__" \
drivers/net/wireless/hostap/"

yields the following warnings:

CHECK drivers/net/wireless/hostap/hostap_info.c
drivers/net/wireless/hostap/hostap_info.c:156:43: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:156:43: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:156:43: got long *<noident>
drivers/net/wireless/hostap/hostap_info.c:294:44: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:294:44: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:294:44: got long *<noident>
drivers/net/wireless/hostap/hostap_info.c:487:12: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:487:12: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:487:12: got long *<noident>
drivers/net/wireless/hostap/hostap_info.c:491:12: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:491:12: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:491:12: got long *<noident>

The warnings are fixed with the following compile-tested changes:

Signed-off-by Larry Finger <[email protected]>

---

drivers/net/wireless/hostap/hostap_info.c +4 -4
Index: wireless-testing/drivers/net/wireless/hostap/hostap_info.c
===================================================================
@@ -153,7 +153,7 @@ static void prism2_info_linkstatus(local
 	}
 
 	/* Get current BSSID later in scheduled task */
-	set_bit(PRISM2_INFO_PENDING_LINKSTATUS, &local->pending_info);
+	set_bit(PRISM2_INFO_PENDING_LINKSTATUS, (ulong *)&local->pending_info);
 	local->prev_link_status = val;
 	schedule_work(&local->info_queue);
 }

@@ -291,7 +291,7 @@ static void prism2_info_scanresults(loca
 	hostap_report_scan_complete(local);
 
 	/* Perform rest of ScanResults handling later in scheduled task */
-	set_bit(PRISM2_INFO_PENDING_SCANRESULTS, &local->pending_info);
+	set_bit(PRISM2_INFO_PENDING_SCANRESULTS, (ulong *)&local->pending_info);
 	schedule_work(&local->info_queue);
 }
 

@@ -484,11 +484,11 @@ static void handle_info_queue(struct wor
 	local_info_t *local = container_of(work, local_info_t, info_queue);
 
 	if (test_and_clear_bit(PRISM2_INFO_PENDING_LINKSTATUS,
-			       &local->pending_info))
+			       (ulong *)&local->pending_info))
 		handle_info_queue_linkstatus(local);
 
 	if (test_and_clear_bit(PRISM2_INFO_PENDING_SCANRESULTS,
-			       &local->pending_info))
+			       (ulong *)&local->pending_info))
 		handle_info_queue_scanresults(local);
 }
 #endif /* PRISM2_NO_STATION_MODES */
maintainer
#1 lore raw

Review

Quoted 2 lines · Larry Finger
(quoted diff) +1 -1
-	set_bit(PRISM2_INFO_PENDING_LINKSTATUS, &local->pending_info);
+	set_bit(PRISM2_INFO_PENDING_LINKSTATUS, (ulong *)&local->pending_info);

Shouldn't you just do this instead?

hostapd_wlan.h +0 -0
@@ ... @@
-	long pending_info;
+	unsigned long pending_info;

?

johannes

author
#2 lore raw

hostapd_wlan.h

Quoted 13 lines · Johannes Berg

Review

Quoted 2 lines · Larry Finger
(quoted diff) +1 -1
-	set_bit(PRISM2_INFO_PENDING_LINKSTATUS, &local->pending_info);
+	set_bit(PRISM2_INFO_PENDING_LINKSTATUS, (ulong *)&local->pending_info);

Shouldn't you just do this instead?

hostapd_wlan.h +0 -0

@@ ... @@

hostapd_wlan.h +1 -1
-	long pending_info;
+	unsigned long pending_info;

Yes. V2 of the patch coming.

Thanks,

Larry

author
#3 lore raw

PATCH v2 1/1 hostap: Fix sparse warnings

In reply to Larry Finger

A compilation with the command "make C=2 CF="-D__CHECK_ENDIAN__" \
drivers/net/wireless/hostap/"

yields the following warnings:

CHECK drivers/net/wireless/hostap/hostap_info.c
drivers/net/wireless/hostap/hostap_info.c:156:43: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:156:43: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:156:43: got long *<noident>
drivers/net/wireless/hostap/hostap_info.c:294:44: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:294:44: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:294:44: got long *<noident>
drivers/net/wireless/hostap/hostap_info.c:487:12: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:487:12: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:487:12: got long *<noident>
drivers/net/wireless/hostap/hostap_info.c:491:12: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:491:12: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:491:12: got long *<noident>

The warnings are fixed with the following compile-tested fix:

Signed-off-by Larry Finger <[email protected]>

---

drivers/net/wireless/hostap/hostap_wlan.h +1 -1
Index: wireless-testing/drivers/net/wireless/hostap/hostap_wlan.h
===================================================================
@@ -822,7 +822,7 @@ struct local_info {
 	int last_scan_results_count;
 	enum { PRISM2_SCAN, PRISM2_HOSTSCAN } last_scan_type;
 	struct work_struct info_queue;
-	long pending_info; /* bit field of pending info_queue items */
+	unsigned long pending_info; /* bit field of pending info_queue items */
 #define PRISM2_INFO_PENDING_LINKSTATUS 0
 #define PRISM2_INFO_PENDING_SCANRESULTS 1
 	int prev_link_status; /* previous received LinkStatus info */
Acked-by on v2 1/1
#4 lore raw
Quoted 10 lines · Larry Finger

CHECK drivers/net/wireless/hostap/hostap_info.c
drivers/net/wireless/hostap/hostap_info.c:156:43: warning: incorrect type in argument 2 (different signedness)
drivers/net/wireless/hostap/hostap_info.c:156:43: expected unsigned long
volatile *addr
drivers/net/wireless/hostap/hostap_info.c:156:43: got long *<noident>

The warnings are fixed with the following compile-tested fix:

Signed-off-by Larry Finger <[email protected]>

This V2 looks good.

Acked-by Jouni Malinen <[email protected]>
Signature · 1 line
Jouni Malinen                                            PGP id EFC895FA