Commit 72bbe3d1 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge branch 'mac80211' into mac80211-next 



This is necessary to merge the new TDLS and mesh patches,
as they depend on some fixes.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 322cd406 923b352f

include/net/cfg80211.h

+17 −0
Original line number Diff line number Diff line
@@ -4867,6 +4867,23 @@ bool cfg80211_reg_can_beacon(struct wiphy *wiphy, 
			     struct cfg80211_chan_def *chandef,

			     enum nl80211_iftype iftype);



/**

 * cfg80211_reg_can_beacon_relax - check if beaconing is allowed with relaxation

 * @wiphy: the wiphy

 * @chandef: the channel definition

 * @iftype: interface type

 *

 * Return: %true if there is no secondary channel or the secondary channel(s)

 * can be used for beaconing (i.e. is not a radar channel etc.). This version

 * also checks if IR-relaxation conditions apply, to allow beaconing under

 * more permissive conditions.

 *

 * Requires the RTNL to be held.

 */

bool cfg80211_reg_can_beacon_relax(struct wiphy *wiphy,

				   struct cfg80211_chan_def *chandef,

				   enum nl80211_iftype iftype);



/*

 * cfg80211_ch_switch_notify - update wdev channel and notify userspace

 * @dev: the device which switched channels

net/mac80211/debugfs_netdev.c

+1 −0
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata) 


	debugfs_remove_recursive(sdata->vif.debugfs_dir);

	sdata->vif.debugfs_dir = NULL;

	sdata->debugfs.subdir_stations = NULL;

}



void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)

net/mac80211/iface.c

+14 −11
Original line number Diff line number Diff line
@@ -1863,10 +1863,6 @@ void ieee80211_sdata_stop(struct ieee80211_sub_if_data *sdata) 
	ieee80211_teardown_sdata(sdata);

}



/*

 * Remove all interfaces, may only be called at hardware unregistration

 * time because it doesn't do RCU-safe list removals.

 */

void ieee80211_remove_interfaces(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata, *tmp;
@@ -1875,14 +1871,21 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local) 


	ASSERT_RTNL();



	/*

	 * Close all AP_VLAN interfaces first, as otherwise they

	 * might be closed while the AP interface they belong to

	 * is closed, causing unregister_netdevice_many() to crash.

	/* Before destroying the interfaces, make sure they're all stopped so

	 * that the hardware is stopped. Otherwise, the driver might still be

	 * iterating the interfaces during the shutdown, e.g. from a worker

	 * or from RX processing or similar, and if it does so (using atomic

	 * iteration) while we're manipulating the list, the iteration will

	 * crash.

	 *

	 * After this, the hardware should be stopped and the driver should

	 * have stopped all of its activities, so that we can do RCU-unaware

	 * manipulations of the interface list below.

	 */

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

		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

			dev_close(sdata->dev);

	cfg80211_shutdown_all_interfaces(local->hw.wiphy);



	WARN(local->open_count, "%s: open count remains %d\n",

	     wiphy_name(local->hw.wiphy), local->open_count);



	mutex_lock(&local->iflist_mtx);

	list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) {

net/mac80211/mesh_plink.c

+4 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 
		if (action == WLAN_SP_MESH_PEERING_CONFIRM) {

			/* AID */

			pos = skb_put(skb, 2);

			put_unaligned_le16(plid, pos + 2);

			put_unaligned_le16(plid, pos);

		}

		if (ieee80211_add_srates_ie(sdata, skb, true, band) ||

		    ieee80211_add_ext_srates_ie(sdata, skb, true, band) ||
@@ -1123,6 +1123,9 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, 
						WLAN_SP_MESH_PEERING_CONFIRM) {

		baseaddr += 4;

		baselen += 4;



		if (baselen > len)

			return;

	}

	ieee802_11_parse_elems(baseaddr, len - baselen, true, &elems);

	mesh_process_plink_frame(sdata, mgmt, &elems);

net/mac80211/pm.c

+16 −0
Original line number Diff line number Diff line
@@ -76,6 +76,22 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 
			if (sdata->vif.type != NL80211_IFTYPE_STATION)

				continue;

			ieee80211_mgd_quiesce(sdata);

			/* If suspended during TX in progress, and wowlan

			 * is enabled (connection will be active) there

			 * can be a race where the driver is put out

			 * of power-save due to TX and during suspend

			 * dynamic_ps_timer is cancelled and TX packet

			 * is flushed, leaving the driver in ACTIVE even

			 * after resuming until dynamic_ps_timer puts

			 * driver back in DOZE.

			 */

			if (sdata->u.mgd.associated &&

			    sdata->u.mgd.powersave &&

			     !(local->hw.conf.flags & IEEE80211_CONF_PS)) {

				local->hw.conf.flags |= IEEE80211_CONF_PS;

				ieee80211_hw_config(local,

						    IEEE80211_CONF_CHANGE_PS);

			}

		}



		err = drv_suspend(local, wowlan);