luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: Initialize vif pointer

Browse Source 
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>
This commit is contained in:
Ivo van Doorn 2008-01-13 14:16:47 +01:00 committed by David S. Miller
parent 61d30020dc
commit 0f7054e32f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/ieee80211_sta.c
View File

@ -2787,6 +2787,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
"for IBSS beacon\n", dev->name); "for IBSS beacon\n", dev->name);
break; break;
} }
control.vif = &sdata->vif;
control.tx_rate = control.tx_rate =
(sdata->bss_conf.use_short_preamble && (sdata->bss_conf.use_short_preamble &&
(ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ? (ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?

1
net/mac80211/tx.c
View File

@ -1752,6 +1752,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
goto out; goto out;
} }
control->vif = vif;
control->tx_rate = control->tx_rate =
(sdata->bss_conf.use_short_preamble && (sdata->bss_conf.use_short_preamble &&
(rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ? (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?