From: Johannes Berg Date: Fri, 1 Feb 2019 10:05:27 +0000 (+0100) Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=752cfee90d11e280d727617bf8d6df894141e157;p=linux.git Merge remote-tracking branch 'net-next/master' into mac80211-next Merge net-next so that we get the changes from net, which would otherwise conflict with the NLA_POLICY_NESTED/_ARRAY changes. Signed-off-by: Johannes Berg --- 752cfee90d11e280d727617bf8d6df894141e157 diff --cc net/wireless/nl80211.c index af89e5c9fd0a1,74150ad958239..ed53f8332ec82 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@@ -555,9 -555,8 +555,9 @@@ const struct nla_policy nl80211_policy[ }, [NL80211_ATTR_TIMEOUT] = NLA_POLICY_MIN(NLA_U32, 1), [NL80211_ATTR_PEER_MEASUREMENTS] = - NLA_POLICY_NESTED(NL80211_PMSR_FTM_REQ_ATTR_MAX, + NLA_POLICY_NESTED(NL80211_PMSR_ATTR_MAX, nl80211_pmsr_attr_policy), + [NL80211_ATTR_AIRTIME_WEIGHT] = NLA_POLICY_MIN(NLA_U16, 1), }; /* policy for the key attributes */