diff options
| author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-01-13 14:16:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:10:08 +0100 |
| commit | 0f7054e32fab251af5cab116da0ef6624a1a0c8b (patch) | |
| tree | 50b865b7d893b0ddda4f7cc01f87964142b1e934 /net | |
| parent | libertas: pepper main with debug statement (diff) | |
| download | linux-0f7054e32fab251af5cab116da0ef6624a1a0c8b.tar.xz linux-0f7054e32fab251af5cab116da0ef6624a1a0c8b.zip | |
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')
| -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, "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 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, goto out; } + control->vif = vif; control->tx_rate = (sdata->bss_conf.use_short_preamble && (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ? |