diff options
| author | Andrew Zaborowski <andrew.zaborowski@intel.com> | 2017-02-23 15:02:10 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-03-06 11:21:47 +0300 |
| commit | f7d3b4f5203832f57ece96300888323fd5a6c6b3 (patch) | |
| tree | 8d1b77902756da1c9128dc80ebd98affd92b0180 | |
| parent | fe56c9c17b09769691e8b91747b32aa2555bef35 (diff) | |
| download | linux-f7d3b4f5203832f57ece96300888323fd5a6c6b3.tar.xz | |
mac80211_hwsim: Make sure NEW_RADIO contains final name
ieee80211_alloc_hw_nm will validate the requested name (if any) before
creating the new device and may use a name different from the one
requested rather than fail. Make sure the HWSIM_CMD_NEW_RADIO
event/response generated has the final name or userspace will receive
the wrong name. Note that mac80211_hwsim_new_radio may now modify
params.
A check for duplicate radio name could be added separately.
Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 307a53a7da23..7b9662ae0143 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2438,6 +2438,9 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, goto failed; } + /* ieee80211_alloc_hw_nm may have used a default name */ + param->hwname = wiphy_name(hw->wiphy); + if (info) net = genl_info_net(info); else |