diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:43:52 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:49:36 +0300 |
| commit | 10f5ae21940cc754f82828d81b8009f2e8ae2c64 (patch) | |
| tree | 8156f045504a2f9e1d767b0af6f89b19a4de2e52 /drivers/net/wireless/virtual | |
| parent | 7d528eafc5290bed18551a22ff25ce8587b603e0 (diff) | |
| parent | f7e60032c6618dfd643c7210d5cba2789e2de2e2 (diff) | |
| download | linux-10f5ae21940cc754f82828d81b8009f2e8ae2c64.tar.xz | |
Merge wireless into wireless-next
There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/virtual')
| -rw-r--r-- | drivers/net/wireless/virtual/mac80211_hwsim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c index c706abbdaa17..37bf392ae9a2 100644 --- a/drivers/net/wireless/virtual/mac80211_hwsim.c +++ b/drivers/net/wireless/virtual/mac80211_hwsim.c @@ -5972,10 +5972,11 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) ret = -ENOMEM; goto out_free; } + param.pmsr_capa = pmsr_capa; + ret = parse_pmsr_capa(info->attrs[HWSIM_ATTR_PMSR_SUPPORT], pmsr_capa, info); if (ret) goto out_free; - param.pmsr_capa = pmsr_capa; } ret = mac80211_hwsim_new_radio(info, ¶m); |