mac80211_hwsim: Check all local addresses for TX Ack status
PATCH 1/1 mac80211_hwsim: Check all local addresses for TX Ack status
Since mac80211_hwsim supports multiple virtual interfaces, we need to iterate through all active interfaces when figuring out whether there is a match during TX Ack status checking. This fixes TX status reporting for cases where secondary interfaces are used.
Signed-off-by Jouni Malinen <[email protected]>
--- drivers/net/wireless/mac80211_hwsim.c | 35 ++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-)
drivers/net/wireless/mac80211_hwsim.c +33 -2
@@ -482,6 +482,38 @@ static bool hwsim_ps_rx_ok(struct mac802 } +struct mac80211_hwsim_addr_match_data { +bool ret; +const u8 *addr; +}; + +static void mac80211_hwsim_addr_iter (void *data,u8 *mac, +struct ieee80211_vif *vif) +{ +struct mac80211_hwsim_addr_match_data *md = data; +if (memcmp (mac, md->addr,ETH_ALEN ) ==0 ) + md->ret = true; +} + + +static bool mac80211_hwsim_addr_match (struct mac80211_hwsim_data *data, +const u8 *addr) +{ +struct mac80211_hwsim_addr_match_data md; + +if (memcmp (addr, data->hw->wiphy->perm_addr,ETH_ALEN ) ==0 ) +return true; + + md.ret = false; + md.addr = addr; +ieee80211_iterate_active_interfaces_atomic (data->hw, + mac80211_hwsim_addr_iter, + &md); + +return md.ret; +} + +static bool mac80211_hwsim_tx_frame (struct ieee80211_hw *hw,struct sk_buff *skb) {
@@ -534,8 +566,7 @@ static bool mac80211_hwsim_tx_frame(struif (nskb ==NULL )continue ; -if (memcmp (hdr->addr1, data2->hw->wiphy->perm_addr, -ETH_ALEN ) ==0 ) +if (mac80211_hwsim_addr_match (data2, hdr->addr1)) ack = true;memcpy (IEEE80211_SKB_RXCB (nskb), &rx_status,sizeof (rx_status));ieee80211_rx_irqsafe (data2->hw, nskb);
Signature · 1 line
Jouni Malinen PGP id EFC895FA