> From: Deren Wu <deren.wu@xxxxxxxxxxxx> > > Enable src address randomization during scheduled scanning > > Co-developed-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx> Here we are missing my SoB, it should be: Co-developed-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx> Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx> > Signed-off-by: Deren Wu <deren.wu@xxxxxxxxxxxx> > --- > .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 14 ++++++++------ > .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 4 +++- > drivers/net/wireless/mediatek/mt76/mt7921/init.c | 3 ++- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > index 73359defa176..b155e7b8d89d 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > @@ -1515,14 +1515,16 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy, > req->version = 1; > req->seq_num = mvif->scan_seq_num | ext_phy << 7; > > - if (is_mt7663(phy->dev) && > - (sreq->flags & NL80211_SCAN_FLAG_RANDOM_ADDR)) { > - get_random_mask_addr(req->mt7663.random_mac, sreq->mac_addr, > - sreq->mac_addr_mask); > + if (sreq->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) { > + u8 *addr = is_mt7663(phy->dev) ? req->mt7663.random_mac > + : req->mt7921.random_mac; > + > req->scan_func = 1; > - } else if (is_mt7921(phy->dev)) { > - req->mt7921.bss_idx = mvif->idx; > + get_random_mask_addr(addr, sreq->mac_addr, > + sreq->mac_addr_mask); > } > + if (is_mt7921(phy->dev)) > + req->mt7921.bss_idx = mvif->idx; > > req->ssids_num = sreq->n_ssids; > for (i = 0; i < req->ssids_num; i++) { > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h > index d64b8058b744..3076417ead5f 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h > @@ -779,7 +779,9 @@ struct mt76_connac_sched_scan_req { > } mt7663; > struct { > u8 bss_idx; > - u8 pad2[63]; > + u8 pad2[19]; > + u8 random_mac[ETH_ALEN]; > + u8 pad3[38]; > } mt7921; > }; > } __packed; > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c > index 59da29032645..19ce9ca72542 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c > @@ -76,7 +76,8 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) > wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH; > wiphy->reg_notifier = mt7921_regd_notifier; > > - wiphy->features |= NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR; > + wiphy->features |= NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR | > + NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR; > wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SET_SCAN_DWELL); > > ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS); > -- > 2.18.0 >
Attachment:
signature.asc
Description: PGP signature