Module Name:    src
Committed By:   christos
Date:           Wed Nov 30 17:23:16 UTC 2016

Modified Files:
        src/external/bsd/wpa/dist/wpa_supplicant: wpa_supplicant.c

Log Message:
grr. usec is also os_time_t :-(


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
    src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
diff -u src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.8 src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.9
--- src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.8	Sun Nov 27 12:06:09 2016
+++ src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c	Wed Nov 30 12:23:16 2016
@@ -4422,8 +4422,8 @@ static void radio_start_next_work(void *
 	os_get_reltime(&now);
 	os_reltime_sub(&now, &work->time, &diff);
 	wpa_dbg(wpa_s, MSG_DEBUG,
-		"Starting radio work '%s'@%p after %jd.%06ld second wait",
-		work->type, work, (intmax_t)diff.sec, diff.usec);
+		"Starting radio work '%s'@%p after %jd.%06jd second wait",
+		work->type, work, (intmax_t)diff.sec, (intmax_t)diff.usec);
 	work->started = 1;
 	work->time = now;
 	radio->num_active_works++;
@@ -6903,7 +6903,7 @@ int wpa_is_bss_tmp_disallowed(struct wpa
 
 	os_reltime_sub(&bss->disallowed_until, &now, &age);
 	wpa_printf(MSG_DEBUG,
-		   "BSS " MACSTR " disabled for %jd.%0ld seconds",
-		   MAC2STR(bss->bssid), (intmax_t)age.sec, age.usec);
+		   "BSS " MACSTR " disabled for %jd.%0jd seconds",
+		   MAC2STR(bss->bssid), (intmax_t)age.sec, (intmax_t)age.usec);
 	return 1;
 }

Reply via email to