diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-10-31 11:43:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-31 11:43:36 -0700 |
| commit | 5a7ec66782fc2d952b355696114104cc828d6440 (patch) | |
| tree | 1868456d5494bc18c3afd7e55a1122150c55ac06 /net/wireless/nl80211.c | |
| parent | Merge branch 'hv_netvsc-fix-error-handling-in-netvsc_attach-set_features' (diff) | |
| parent | nl80211: fix validation of mesh path nexthop (diff) | |
| download | linux-dev-5a7ec66782fc2d952b355696114104cc828d6440.tar.xz linux-dev-5a7ec66782fc2d952b355696114104cc828d6440.zip | |
Merge tag 'mac80211-for-net-2019-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just two fixes:
* HT operation is not allowed on channel 14 (Japan only)
* netlink policy for nexthop attribute was wrong
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/wireless/nl80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 4453dd375de9..7b72286922f7 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -393,7 +393,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ }, [NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY, .len = IEEE80211_MAX_MESH_ID_LEN }, - [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 }, + [NL80211_ATTR_MPATH_NEXT_HOP] = NLA_POLICY_ETH_ADDR_COMPAT, [NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 }, [NL80211_ATTR_REG_RULES] = { .type = NLA_NESTED }, |