Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / hostap / hostap_wlan.h

diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index a68f97c3935947a59990d188f7d95d05b19c600c..d2c7a56b8b598db01fcdead58a0b9f0b461eeda8 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/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 */