Skip to content

Commit

Permalink
wifi: mac80211_hwsim: send NDP for link (de)activation
Browse files Browse the repository at this point in the history
In hwsim we now track when we receive NDP (or other frames
carrying a PM bit) to see if a link should be active, but
then of course we also need to transmit NDPs to at least
set a link to inactive when we deacivate it. Implement that
as well as sending an NDP when we activate a link, which
allows receiving frames before transmitting any.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Sep 6, 2022
1 parent 0ab2638 commit 5fc8cea
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions drivers/net/wireless/mac80211_hwsim.c
Original file line number Diff line number Diff line change
Expand Up @@ -2950,6 +2950,18 @@ static int mac80211_hwsim_assign_vif_chanctx(struct ieee80211_hw *hw,
hwsim_check_magic(vif);
hwsim_check_chanctx_magic(ctx);

/* if we activate a link while already associated wake it up */
if (vif->type == NL80211_IFTYPE_STATION && vif->cfg.assoc) {
struct sk_buff *skb;

skb = ieee80211_nullfunc_get(hw, vif, link_conf->link_id, true);
if (skb) {
local_bh_disable();
mac80211_hwsim_tx_frame(hw, skb, ctx->def.chan);
local_bh_enable();
}
}

return 0;
}

Expand All @@ -2960,6 +2972,22 @@ static void mac80211_hwsim_unassign_vif_chanctx(struct ieee80211_hw *hw,
{
hwsim_check_magic(vif);
hwsim_check_chanctx_magic(ctx);

/* if we deactivate a link while associated suspend it first */
if (vif->type == NL80211_IFTYPE_STATION && vif->cfg.assoc) {
struct sk_buff *skb;

skb = ieee80211_nullfunc_get(hw, vif, link_conf->link_id, true);
if (skb) {
struct ieee80211_hdr *hdr = (void *)skb->data;

hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);

local_bh_disable();
mac80211_hwsim_tx_frame(hw, skb, ctx->def.chan);
local_bh_enable();
}
}
}

static const char mac80211_hwsim_gstrings_stats[][ETH_GSTRING_LEN] = {
Expand Down

0 comments on commit 5fc8cea

Please sign in to comment.