diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-03-21 11:07:02 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-03-21 11:08:45 +0300 |
| commit | 796e1112176ada7ebc084491458dfbfbe3a193b6 (patch) | |
| tree | 51542a73a916fa835aac2d901dd5d13391273baf /drivers/net/wireless | |
| parent | 0466080c751ec2de9efae3ac6305225cc4326047 (diff) | |
| download | linux-796e1112176ada7ebc084491458dfbfbe3a193b6.tar.xz | |
mac80211_hwsim: fix secondary MAC address assignment
OR'ing in 0x40 before a memcpy() to overwrite the value doesn't
do much good - flip the order of operations are reported and
tested by Jouni.
Fixes: cb1a5bae5684 ("mac80211_hwsim: add permanent mac address option for new radios")
Reported-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 7b6c3640a94f..930ddef91093 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2584,8 +2584,8 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, addr[4] = idx; memcpy(data->addresses[0].addr, addr, ETH_ALEN); /* Why need here second address ? */ - data->addresses[1].addr[0] |= 0x40; memcpy(data->addresses[1].addr, addr, ETH_ALEN); + data->addresses[1].addr[0] |= 0x40; hw->wiphy->n_addresses = 2; hw->wiphy->addresses = data->addresses; /* possible address clash is checked at hash table insertion */ |