diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-01-13 08:16:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:10:08 -0500 |
commit | 0f7054e32fab251af5cab116da0ef6624a1a0c8b (patch) | |
tree | 50b865b7d893b0ddda4f7cc01f87964142b1e934 /net/mac80211/tx.c | |
parent | 61d30020dc2c49d36d95f3efb8b5ed727e459087 (diff) |
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 <IvDoorn@gmail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 1 |
1 files changed, 1 insertions, 0 deletions
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)) ? |