Skip to content

Commit

Permalink
mac80211: cleanup suspend/resume on ibss mode
Browse files Browse the repository at this point in the history
Remove not used any longer suspend/resume code.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Stanislaw Gruszka authored and Johannes Berg committed Mar 6, 2013
1 parent 9b7d72c commit a618294
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 deletions.
29 changes: 1 addition & 28 deletions net/mac80211/ibss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 0 additions & 4 deletions net/mac80211/ieee80211_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,6 @@ struct ieee80211_if_ibss {

u32 basic_rates;

bool timer_running;

bool fixed_bssid;
bool fixed_channel;
bool privacy;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a618294

Please sign in to comment.