aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/ieee80211_sta.c1
-rw-r--r--net/mac80211/tx.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 866eb807812..8b47d81fc71 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2787,6 +2787,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
"for IBSS beacon\n", dev->name);
break;
}
+ control.vif = &sdata->vif;
control.tx_rate =
(sdata->bss_conf.use_short_preamble &&
(ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index f9088fe34d5..67b509edd43 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1752,6 +1752,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
goto out;
}
+ control->vif = vif;
control->tx_rate =
(sdata->bss_conf.use_short_preamble &&
(rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?