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

Commit a1678f84 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: move STA timer restart 



This I shouldn't have moved to the scan implementation, move
it back to the MLME where it belongs, to the notification.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 24723d1b

net/mac80211/mlme.c

+13 −0
Original line number Diff line number Diff line
@@ -2594,6 +2594,13 @@ void ieee80211_sta_work(struct work_struct *work) 
	}

}



static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)

{

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

	    ieee80211_vif_is_mesh(&sdata->vif))

		ieee80211_sta_timer((unsigned long)sdata);

}



void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata = local->scan_sdata;
@@ -2606,4 +2613,10 @@ void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local) 
		    !ieee80211_sta_active_ibss(sdata)))

			ieee80211_sta_find_ibss(sdata, ifsta);

	}



	/* Restart STA timers */

	rcu_read_lock();

	list_for_each_entry_rcu(sdata, &local->interfaces, list)

		ieee80211_restart_sta_timer(sdata);

	rcu_read_unlock();

}

net/mac80211/scan.c

+0 −14
Original line number Diff line number Diff line
@@ -424,13 +424,6 @@ static void ieee80211_send_nullfunc(struct ieee80211_local *local, 
	ieee80211_tx_skb(sdata, skb, 0);

}



static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)

{

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

	    ieee80211_vif_is_mesh(&sdata->vif))

		ieee80211_sta_timer((unsigned long)sdata);

}



void ieee80211_scan_completed(struct ieee80211_hw *hw)

{

	struct ieee80211_local *local = hw_to_local(hw);
@@ -446,11 +439,6 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) 
		if (ieee80211_hw_config(local))

			printk(KERN_DEBUG "%s: failed to restore operational "

			       "channel after scan\n", wiphy_name(local->hw.wiphy));

		/* Restart STA timer for HW scan case */

		rcu_read_lock();

		list_for_each_entry_rcu(sdata, &local->interfaces, list)

			ieee80211_restart_sta_timer(sdata);

		rcu_read_unlock();



		goto done;

	}
@@ -483,8 +471,6 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) 
			}

		} else

			netif_tx_wake_all_queues(sdata->dev);



		ieee80211_restart_sta_timer(sdata);

	}

	rcu_read_unlock();