Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd0f979a authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: simplify idle handling 



Now that we have channel contexts, idle is (pretty
much) equivalent to not having a channel context.
Change the code to use this relation so that there
no longer is a need for a lot of idle recalculate
calls everywhere.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f1e3e051

net/mac80211/chan.c

+13 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ ieee80211_new_chanctx(struct ieee80211_local *local, 


	list_add_rcu(&ctx->list, &local->chanctx_list);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);



	return ctx;

}
@@ -110,6 +114,10 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local, 


	list_del_rcu(&ctx->list);

	kfree_rcu(ctx, rcu_head);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);

}



static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata,
@@ -128,6 +136,8 @@ static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata, 
	ctx->refcount++;



	ieee80211_recalc_txpower(sdata);

	sdata->vif.bss_conf.idle = false;

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IDLE);



	return 0;

}
@@ -175,6 +185,9 @@ static void ieee80211_unassign_vif_chanctx(struct ieee80211_sub_if_data *sdata, 
	ctx->refcount--;

	rcu_assign_pointer(sdata->vif.chanctx_conf, NULL);



	sdata->vif.bss_conf.idle = true;

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IDLE);



	drv_unassign_vif_chanctx(local, sdata, ctx);



	if (ctx->refcount > 0) {

net/mac80211/ibss.c

+0 −8
Original line number Diff line number Diff line
@@ -1108,10 +1108,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, 


	mutex_unlock(&sdata->u.ibss.mtx);



	mutex_lock(&sdata->local->mtx);

	ieee80211_recalc_idle(sdata->local);

	mutex_unlock(&sdata->local->mtx);



	/*

	 * 802.11n-2009 9.13.3.1: In an IBSS, the HT Protection field is

	 * reserved, but an HT STA shall protect HT transmissions as though
@@ -1209,9 +1205,5 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) 


	mutex_unlock(&sdata->u.ibss.mtx);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(sdata->local);

	mutex_unlock(&local->mtx);



	return 0;

}

net/mac80211/ieee80211_i.h

+0 −3
Original line number Diff line number Diff line
@@ -689,9 +689,6 @@ struct ieee80211_sub_if_data { 


	char name[IFNAMSIZ];



	/* to detect idle changes */

	bool old_idle;



	/* Fragment table for host-based reassembly */

	struct ieee80211_fragment_entry	fragments[IEEE80211_FRAGMENT_MAX];

	unsigned int fragment_next;

net/mac80211/iface.c

+12 −82
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) 
		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER);

}



static u32 ieee80211_idle_off(struct ieee80211_local *local,

			      const char *reason)

static u32 ieee80211_idle_off(struct ieee80211_local *local)

{

	if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE))

		return 0;
@@ -99,106 +98,45 @@ static u32 ieee80211_idle_on(struct ieee80211_local *local) 
	return IEEE80211_CONF_CHANGE_IDLE;

}



static u32 __ieee80211_recalc_idle(struct ieee80211_local *local)

void ieee80211_recalc_idle(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata;

	int count = 0;

	bool working = false, scanning = false;

	bool working = false, scanning, active;

	unsigned int led_trig_start = 0, led_trig_stop = 0;

	struct ieee80211_roc_work *roc;

	u32 change;



#ifdef CONFIG_PROVE_LOCKING

	WARN_ON(debug_locks && !lockdep_rtnl_is_held() &&

		!lockdep_is_held(&local->iflist_mtx));

#endif

	lockdep_assert_held(&local->mtx);



	list_for_each_entry(sdata, &local->interfaces, list) {

		if (!ieee80211_sdata_running(sdata)) {

			sdata->vif.bss_conf.idle = true;

			continue;

		}



		sdata->old_idle = sdata->vif.bss_conf.idle;



		/* do not count disabled managed interfaces */

		if (sdata->vif.type == NL80211_IFTYPE_STATION &&

		    !sdata->u.mgd.associated &&

		    !sdata->u.mgd.auth_data &&

		    !sdata->u.mgd.assoc_data) {

			sdata->vif.bss_conf.idle = true;

			continue;

		}

		/* do not count unused IBSS interfaces */

		if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&

		    !sdata->u.ibss.ssid_len) {

			sdata->vif.bss_conf.idle = true;

			continue;

		}



		if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)

			continue;



		/* count everything else */

		sdata->vif.bss_conf.idle = false;

		count++;

	}

	active = !list_empty(&local->chanctx_list);



	if (!local->ops->remain_on_channel) {

		list_for_each_entry(roc, &local->roc_list, list) {

			working = true;

			roc->sdata->vif.bss_conf.idle = false;

			break;

		}

	}



	scanning = test_bit(SCAN_SW_SCANNING, &local->scanning) ||

		   test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning);



	list_for_each_entry(sdata, &local->interfaces, list) {

		if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||

		    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||

		    sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)

			continue;

		if (sdata->old_idle == sdata->vif.bss_conf.idle)

			continue;

		if (!ieee80211_sdata_running(sdata))

			continue;

		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IDLE);

	}



	if (working || scanning)

		led_trig_start |= IEEE80211_TPT_LEDTRIG_FL_WORK;

	else

		led_trig_stop |= IEEE80211_TPT_LEDTRIG_FL_WORK;



	if (count)

	if (active)

		led_trig_start |= IEEE80211_TPT_LEDTRIG_FL_CONNECTED;

	else

		led_trig_stop |= IEEE80211_TPT_LEDTRIG_FL_CONNECTED;



	ieee80211_mod_tpt_led_trig(local, led_trig_start, led_trig_stop);



	if (working)

		return ieee80211_idle_off(local, "working");

	if (scanning)

		return ieee80211_idle_off(local, "scanning");

	if (!count)

		return ieee80211_idle_on(local);

	if (working || scanning || active)

		change = ieee80211_idle_off(local);

	else

		return ieee80211_idle_off(local, "in use");



	return 0;

}



void ieee80211_recalc_idle(struct ieee80211_local *local)

{

	u32 chg;



	mutex_lock(&local->iflist_mtx);

	chg = __ieee80211_recalc_idle(local);

	mutex_unlock(&local->iflist_mtx);

	if (chg)

		ieee80211_hw_config(local, chg);

		change = ieee80211_idle_on(local);

	if (change)

		ieee80211_hw_config(local, change);

}



static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
@@ -692,10 +630,6 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
	if (sdata->flags & IEEE80211_SDATA_PROMISC)

		atomic_inc(&local->iff_promiscs);



	mutex_lock(&local->mtx);

	hw_reconf_flags |= __ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);



	if (coming_up)

		local->open_count++;
@@ -888,10 +822,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 


	sdata->bss = NULL;



	mutex_lock(&local->mtx);

	hw_reconf_flags |= __ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);



	ieee80211_recalc_ps(local, -1);



	if (local->open_count == 0) {

net/mac80211/mlme.c

+0 −34
Original line number Diff line number Diff line
@@ -1792,7 +1792,6 @@ EXPORT_SYMBOL(ieee80211_ap_probereq_get); 
static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct ieee80211_local *local = sdata->local;

	u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];



	mutex_lock(&ifmgd->mtx);
@@ -1812,10 +1811,6 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) 
	 * but that's not a problem.

	 */

	cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);

}



static void ieee80211_beacon_connection_loss_work(struct work_struct *work)
@@ -2048,10 +2043,6 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata, 


	ieee80211_set_disassoc(sdata, 0, 0, false, NULL);



	mutex_lock(&sdata->local->mtx);

	ieee80211_recalc_idle(sdata->local);

	mutex_unlock(&sdata->local->mtx);



	return RX_MGMT_CFG80211_DEAUTH;

}
@@ -2079,10 +2070,6 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, 


	ieee80211_set_disassoc(sdata, 0, 0, false, NULL);



	mutex_lock(&sdata->local->mtx);

	ieee80211_recalc_idle(sdata->local);

	mutex_unlock(&sdata->local->mtx);



	return RX_MGMT_CFG80211_DISASSOC;

}
@@ -2839,7 +2826,6 @@ static void ieee80211_sta_timer(unsigned long data) 
static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,

					  u8 *bssid, u8 reason, bool tx)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
@@ -2853,10 +2839,6 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, 
	 */

	cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);



	mutex_lock(&ifmgd->mtx);

}
@@ -3127,10 +3109,6 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) 
	}



	mutex_unlock(&ifmgd->mtx);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);

}



static void ieee80211_sta_bcn_mon_timer(unsigned long data)
@@ -3644,10 +3622,6 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, 
			return -ENOMEM;

	}



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(sdata->local);

	mutex_unlock(&local->mtx);



	if (new_sta) {

		u32 rates = 0, basic_rates = 0;

		bool have_higher_than_11mbit;
@@ -4138,10 +4112,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, 
	mutex_unlock(&ifmgd->mtx);



 out:

	mutex_lock(&sdata->local->mtx);

	ieee80211_recalc_idle(sdata->local);

	mutex_unlock(&sdata->local->mtx);



	if (sent_frame)

		__cfg80211_send_deauth(sdata->dev, frame_buf,

				       IEEE80211_DEAUTH_FRAME_LEN);
@@ -4182,10 +4152,6 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, 
	__cfg80211_send_disassoc(sdata->dev, frame_buf,

				 IEEE80211_DEAUTH_FRAME_LEN);



	mutex_lock(&sdata->local->mtx);

	ieee80211_recalc_idle(sdata->local);

	mutex_unlock(&sdata->local->mtx);



	return 0;

}