Commit 0f7054e3 authored Jan 13, 2008 by Ivo van Doorn Committed by David S. Miller Jan 28, 2008

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>

parent 61d30020

net/mac80211/ieee80211_sta.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)) ?

net/mac80211/tx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)) ?