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

Commit 0c9a67c8 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'mac80211-for-john-2014-11-04' of... 

Merge tag 'mac80211-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg <johannes@sipsolutions.net> says:

"This contains another small set of fixes for 3.18, these are all
over the place and most of the bugs are old, one even dates back
to the original mac80211 we merged into the kernel."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents c00ed46d b8fff407

drivers/net/wireless/mac80211_hwsim.c

+3 −1
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2, 
	if (err != 0) {

		printk(KERN_DEBUG "mac80211_hwsim: device_bind_driver failed (%d)\n",

		       err);

		goto failed_hw;

		goto failed_bind;

	}



	skb_queue_head_init(&data->pending);
@@ -2183,6 +2183,8 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2, 
	return idx;



failed_hw:

	device_release_driver(data->dev);

failed_bind:

	device_unregister(data->dev);

failed_drvdata:

	ieee80211_free_hw(hw);

net/mac80211/ibss.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata, 


	memset(&params, 0, sizeof(params));

	memset(&csa_ie, 0, sizeof(csa_ie));

	err = ieee80211_parse_ch_switch_ie(sdata, elems, beacon,

	err = ieee80211_parse_ch_switch_ie(sdata, elems,

					   ifibss->chandef.chan->band,

					   sta_flags, ifibss->bssid, &csa_ie);

	/* can't switch to destination channel, fail */

net/mac80211/ieee80211_i.h

+1 −2
Original line number Diff line number Diff line
@@ -1642,7 +1642,6 @@ void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, 
 * ieee80211_parse_ch_switch_ie - parses channel switch IEs

 * @sdata: the sdata of the interface which has received the frame

 * @elems: parsed 802.11 elements received with the frame

 * @beacon: indicates if the frame was a beacon or probe response

 * @current_band: indicates the current band

 * @sta_flags: contains information about own capabilities and restrictions

 *	to decide which channel switch announcements can be accepted. Only the
@@ -1656,7 +1655,7 @@ void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, 
 * Return: 0 on success, <0 on error and >0 if there is nothing to parse.

 */

int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,

				 struct ieee802_11_elems *elems, bool beacon,

				 struct ieee802_11_elems *elems,

				 enum ieee80211_band current_band,

				 u32 sta_flags, u8 *bssid,

				 struct ieee80211_csa_ie *csa_ie);

net/mac80211/iface.c

+12 −6
Original line number Diff line number Diff line
@@ -766,10 +766,12 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
	int i, flushed;

	struct ps_data *ps;

	struct cfg80211_chan_def chandef;

	bool cancel_scan;



	clear_bit(SDATA_STATE_RUNNING, &sdata->state);



	if (rcu_access_pointer(local->scan_sdata) == sdata)

	cancel_scan = rcu_access_pointer(local->scan_sdata) == sdata;

	if (cancel_scan)

		ieee80211_scan_cancel(local);



	/*
@@ -898,6 +900,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
		list_del(&sdata->u.vlan.list);

		mutex_unlock(&local->mtx);

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

		/* see comment in the default case below */

		ieee80211_free_keys(sdata, true);

		/* no need to tell driver */

		break;

	case NL80211_IFTYPE_MONITOR:
@@ -923,17 +927,16 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
		/*

		 * When we get here, the interface is marked down.

		 * Free the remaining keys, if there are any

		 * (shouldn't be, except maybe in WDS mode?)

		 * (which can happen in AP mode if userspace sets

		 * keys before the interface is operating, and maybe

		 * also in WDS mode)

		 *

		 * Force the key freeing to always synchronize_net()

		 * to wait for the RX path in case it is using this

		 * interface enqueuing frames * at this very time on

		 * interface enqueuing frames at this very time on

		 * another CPU.

		 */

		ieee80211_free_keys(sdata, true);



		/* fall through */

	case NL80211_IFTYPE_AP:

		skb_queue_purge(&sdata->skb_queue);

	}
@@ -991,6 +994,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 


	ieee80211_recalc_ps(local, -1);



	if (cancel_scan)

		flush_delayed_work(&local->scan_work);



	if (local->open_count == 0) {

		ieee80211_stop_device(local);

net/mac80211/mesh.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ ieee80211_mesh_process_chnswitch(struct ieee80211_sub_if_data *sdata, 


	memset(&params, 0, sizeof(params));

	memset(&csa_ie, 0, sizeof(csa_ie));

	err = ieee80211_parse_ch_switch_ie(sdata, elems, beacon, band,

	err = ieee80211_parse_ch_switch_ie(sdata, elems, band,

					   sta_flags, sdata->vif.addr,

					   &csa_ie);

	if (err < 0)