diff options
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 1 | ||||
-rw-r--r-- | net/mac80211/tx.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index 866eb8078121..8b47d81fc716 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, | |||
2787 | "for IBSS beacon\n", dev->name); | 2787 | "for IBSS beacon\n", dev->name); |
2788 | break; | 2788 | break; |
2789 | } | 2789 | } |
2790 | control.vif = &sdata->vif; | ||
2790 | control.tx_rate = | 2791 | control.tx_rate = |
2791 | (sdata->bss_conf.use_short_preamble && | 2792 | (sdata->bss_conf.use_short_preamble && |
2792 | (ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ? | 2793 | (ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ? |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f9088fe34d59..67b509edd431 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, | |||
1752 | goto out; | 1752 | goto out; |
1753 | } | 1753 | } |
1754 | 1754 | ||
1755 | control->vif = vif; | ||
1755 | control->tx_rate = | 1756 | control->tx_rate = |
1756 | (sdata->bss_conf.use_short_preamble && | 1757 | (sdata->bss_conf.use_short_preamble && |
1757 | (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ? | 1758 | (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ? |