summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-01-13 14:16:47 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:10:08 -0800
commit0f7054e32fab251af5cab116da0ef6624a1a0c8b (patch)
tree50b865b7d893b0ddda4f7cc01f87964142b1e934 /net/mac80211
parent61d30020dc2c49d36d95f3efb8b5ed727e459087 (diff)
downloadop-kernel-dev-0f7054e32fab251af5cab116da0ef6624a1a0c8b.zip
op-kernel-dev-0f7054e32fab251af5cab116da0ef6624a1a0c8b.tar.gz
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')
-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 866eb80..8b47d81 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 f9088fe..67b509e 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)) ?
OpenPOWER on IntegriCloud