diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
| commit | bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004 (patch) | |
| tree | 3f03062a9e759dba7b09df0feccbb58b8f7ab4cc /net/mac80211/mesh.c | |
| parent | 7126bd5c8bcbc015cf89864cf71d750e8f33f924 (diff) | |
| parent | ac3a0c8472969a03c0496ae774b3a29eb26c8d5a (diff) | |
| download | linux-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7248d2396ab85c8652e20c0c39beaba
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index d0db6af16427..7ecd801a943b 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -620,6 +620,19 @@ int mesh_add_he_oper_ie(struct ieee80211_sub_if_data *sdata, int mesh_add_he_6ghz_cap_ie(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) { + struct ieee80211_supported_band *sband; + const struct ieee80211_sband_iftype_data *iftd; + + sband = ieee80211_get_sband(sdata); + if (!sband) + return -EINVAL; + + iftd = ieee80211_get_sband_iftype_data(sband, + NL80211_IFTYPE_MESH_POINT); + /* The device doesn't support HE in mesh mode or at all */ + if (!iftd) + return 0; + ieee80211_ie_build_he_6ghz_cap(sdata, skb); return 0; } |