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

Commit a6182943 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Johannes Berg
Browse files

mac80211: cleanup suspend/resume on ibss mode 



Remove not used any longer suspend/resume code.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9b7d72c1

net/mac80211/ibss.c

+1 −28
Original line number Diff line number Diff line
@@ -985,36 +985,9 @@ static void ieee80211_ibss_timer(unsigned long data) 
{

	struct ieee80211_sub_if_data *sdata =

		(struct ieee80211_sub_if_data *) data;

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;

	struct ieee80211_local *local = sdata->local;



	if (local->quiescing) {

		ifibss->timer_running = true;

		return;

	}



	ieee80211_queue_work(&local->hw, &sdata->work);

}



#ifdef CONFIG_PM

void ieee80211_ibss_quiesce(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;



	if (del_timer_sync(&ifibss->timer))

		ifibss->timer_running = true;

}



void ieee80211_ibss_restart(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;



	if (ifibss->timer_running) {

		add_timer(&ifibss->timer);

		ifibss->timer_running = false;

	}

	ieee80211_queue_work(&sdata->local->hw, &sdata->work);

}

#endif



void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata)

{

net/mac80211/ieee80211_i.h

+0 −4
Original line number Diff line number Diff line
@@ -492,8 +492,6 @@ struct ieee80211_if_ibss { 


	u32 basic_rates;



	bool timer_running;



	bool fixed_bssid;

	bool fixed_channel;

	bool privacy;
@@ -1293,8 +1291,6 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata, 
int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,

			struct cfg80211_ibss_params *params);

int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata);

void ieee80211_ibss_quiesce(struct ieee80211_sub_if_data *sdata);

void ieee80211_ibss_restart(struct ieee80211_sub_if_data *sdata);

void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata);

void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,

				   struct sk_buff *skb);