Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[profile/ivi/kernel-adaptation-intel-automotive.git] / net / wireless / util.c

diff --git a/net/wireless/util.c b/net/wireless/util.c
index e76cc28..487cdd9 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -9,7 +9,7 @@
 
 struct ieee80211_rate *
 ieee80211_get_response_rate(struct ieee80211_supported_band *sband,
-                           u64 basic_rates, int bitrate)
+                           u32 basic_rates, int bitrate)
 {
        struct ieee80211_rate *result = &sband->bitrates[0];
        int i;