diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-22 10:28:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-22 10:28:38 +0100 |
| commit | e1c51aa8705fd78e5259e0515aad3b5003e18550 (patch) | |
| tree | 3728628142a24460d6b488e5331f421f902e5d3a /net/wireless/nl80211.c | |
| parent | 6e49b7fa3083c30688b7fff1b37ed891cd1c30af (diff) | |
| parent | 08556e03ad36b2c6219aba90de88ccf58038e208 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linaro-lsk-v4.9-rt-test
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 91722e97cdd5..36280e114959 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4081,7 +4081,7 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info, struct nlattr *rate; u32 bitrate; u16 bitrate_compat; - enum nl80211_attrs rate_flg; + enum nl80211_rate_info rate_flg; rate = nla_nest_start(msg, attr); if (!rate) @@ -10777,7 +10777,8 @@ static int nl80211_nan_add_func(struct sk_buff *skb, break; case NL80211_NAN_FUNC_FOLLOW_UP: if (!tb[NL80211_NAN_FUNC_FOLLOW_UP_ID] || - !tb[NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID]) { + !tb[NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID] || + !tb[NL80211_NAN_FUNC_FOLLOW_UP_DEST]) { err = -EINVAL; goto out; } |