Commit 075e0847 authored by Johannes Berg's avatar Johannes Berg
Browse files

Revert "mac80211: refactor virtual monitor code" 



This reverts commit 870d37fc.

This code doesn't work as cfg80211 will call
set_monitor_enabled at the wrong time and it
doesn't seem to be possible to fix this.

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

net/mac80211/cfg.c

+0 −11
Original line number Diff line number Diff line
@@ -2982,16 +2982,6 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 
	return 0;

}



static void ieee80211_set_monitor_enabled(struct wiphy *wiphy, bool enabled)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);



	if (enabled)

		WARN_ON(ieee80211_add_virtual_monitor(local));

	else

		ieee80211_del_virtual_monitor(local);

}



#ifdef CONFIG_PM

static void ieee80211_set_wakeup(struct wiphy *wiphy, bool enabled)

{
@@ -3066,7 +3056,6 @@ struct cfg80211_ops mac80211_config_ops = { 
	.tdls_mgmt = ieee80211_tdls_mgmt,

	.probe_client = ieee80211_probe_client,

	.set_noack_map = ieee80211_set_noack_map,

	.set_monitor_enabled = ieee80211_set_monitor_enabled,

#ifdef CONFIG_PM

	.set_wakeup = ieee80211_set_wakeup,

#endif

net/mac80211/ieee80211_i.h

+0 −4
Original line number Diff line number Diff line
@@ -1491,10 +1491,6 @@ int ieee80211_add_srates_ie(struct ieee80211_sub_if_data *sdata, 
int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata,

				struct sk_buff *skb, bool need_basic);



/* virtual monitor */

int ieee80211_add_virtual_monitor(struct ieee80211_local *local);

void ieee80211_del_virtual_monitor(struct ieee80211_local *local);



/* channel management */

enum ieee80211_chan_mode {

	CHAN_MODE_UNDEFINED,

net/mac80211/iface.c

+14 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void ieee80211_set_default_queues(struct ieee80211_sub_if_data *sdata) 
	sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;

}



int ieee80211_add_virtual_monitor(struct ieee80211_local *local)

static int ieee80211_add_virtual_monitor(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata;

	int ret = 0;
@@ -377,7 +377,7 @@ int ieee80211_add_virtual_monitor(struct ieee80211_local *local) 
	return ret;

}



void ieee80211_del_virtual_monitor(struct ieee80211_local *local)

static void ieee80211_del_virtual_monitor(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata;
@@ -497,6 +497,12 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) 
			break;

		}



		if (local->monitors == 0 && local->open_count == 0) {

			res = ieee80211_add_virtual_monitor(local);

			if (res)

				goto err_stop;

		}



		/* must be before the call to ieee80211_configure_filter */

		local->monitors++;

		if (local->monitors == 1) {
@@ -511,6 +517,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) 
		break;

	default:

		if (coming_up) {

			ieee80211_del_virtual_monitor(local);



			res = drv_add_interface(local, sdata);

			if (res)

				goto err_stop;
@@ -745,6 +753,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
		if (local->monitors == 0) {

			local->hw.conf.flags &= ~IEEE80211_CONF_MONITOR;

			hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR;

			ieee80211_del_virtual_monitor(local);

		}



		ieee80211_adjust_monitor_flags(sdata, -1);
@@ -818,6 +827,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
		}

	}

	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);



	if (local->monitors == local->open_count && local->monitors > 0)

		ieee80211_add_virtual_monitor(local);

}



static int ieee80211_stop(struct net_device *dev)