|
@@ -38,7 +38,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
|
|
|
const u8 *bssid, const int beacon_int,
|
|
|
struct ieee80211_channel *chan,
|
|
|
const u32 basic_rates,
|
|
|
- const u16 capability, u64 tsf)
|
|
|
+ const u16 capability, u64 tsf,
|
|
|
+ bool creator)
|
|
|
{
|
|
|
struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
@@ -71,6 +72,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
|
|
|
/* if merging, indicate to driver that we leave the old IBSS */
|
|
|
if (sdata->vif.bss_conf.ibss_joined) {
|
|
|
sdata->vif.bss_conf.ibss_joined = false;
|
|
|
+ sdata->vif.bss_conf.ibss_creator = false;
|
|
|
netif_carrier_off(sdata->dev);
|
|
|
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IBSS);
|
|
|
}
|
|
@@ -197,6 +199,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
|
|
|
bss_change |= BSS_CHANGED_HT;
|
|
|
bss_change |= BSS_CHANGED_IBSS;
|
|
|
sdata->vif.bss_conf.ibss_joined = true;
|
|
|
+ sdata->vif.bss_conf.ibss_creator = creator;
|
|
|
ieee80211_bss_info_change_notify(sdata, bss_change);
|
|
|
|
|
|
ieee80211_sta_def_wmm_params(sdata, sband->n_bitrates, supp_rates);
|
|
@@ -249,7 +252,8 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
|
|
|
cbss->channel,
|
|
|
basic_rates,
|
|
|
cbss->capability,
|
|
|
- cbss->tsf);
|
|
|
+ cbss->tsf,
|
|
|
+ false);
|
|
|
}
|
|
|
|
|
|
static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
|
|
@@ -734,7 +738,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
|
|
|
|
|
|
__ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
|
|
|
ifibss->channel, ifibss->basic_rates,
|
|
|
- capability, 0);
|
|
|
+ capability, 0, true);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1198,6 +1202,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
|
|
|
lockdep_is_held(&sdata->u.ibss.mtx));
|
|
|
RCU_INIT_POINTER(sdata->u.ibss.presp, NULL);
|
|
|
sdata->vif.bss_conf.ibss_joined = false;
|
|
|
+ sdata->vif.bss_conf.ibss_creator = false;
|
|
|
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
|
|
|
BSS_CHANGED_IBSS);
|
|
|
synchronize_rcu();
|