From 0f7054e32fab251af5cab116da0ef6624a1a0c8b Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Sun, 13 Jan 2008 14:16:47 +0100 Subject: mac80211: Initialize vif pointer Before calling update_beacon() mac80211 must initialize the control.vif pointer so it can be used by the driver to determine which interface is trying to send the beacon. v2: ieee80211_beacon_get() should also initialize the vif pointer since it can be called by mac80211 internally before calling config_interface(). Signed-off-by: Ivo van Doorn Acked-by: Johannes Berg Signed-off-by: John W. Linville --- net/mac80211/ieee80211_sta.c | 1 + net/mac80211/tx.c | 1 + 2 files changed, 2 insertions(+) (limited to 'net/mac80211') 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)) ? -- cgit v1.2.3