Commit e7792df8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2019-06-28' of...

Merge tag 'mac80211-for-davem-2019-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just a single patch:
 * 1<<31 is undefined, use 1U<<31 in nl80211.h UAPI
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2c377b5a d2ce8d6b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -5314,7 +5314,7 @@ enum nl80211_feature_flags {
	NL80211_FEATURE_TDLS_CHANNEL_SWITCH		= 1 << 28,
	NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR		= 1 << 29,
	NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR	= 1 << 30,
	NL80211_FEATURE_ND_RANDOM_MAC_ADDR		= 1 << 31,
	NL80211_FEATURE_ND_RANDOM_MAC_ADDR		= 1U << 31,
};

/**