Commit 1a6da4fc authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-net-2020-05-25' of... 

Merge tag 'mac80211-for-net-2020-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
A few changes:
 * fix a debugfs vs. wiphy rename crash
 * fix an invalid HE spec definition
 * fix a mesh timer crash
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 15c97385 0bbab5f0

include/linux/ieee80211.h

+1 −1
Original line number Diff line number Diff line
@@ -2047,7 +2047,7 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) 
}



/* HE Operation defines */

#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK		0x00000003

#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK		0x00000007

#define IEEE80211_HE_OPERATION_TWT_REQUIRED			0x00000008

#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK		0x00003ff0

#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET		4

net/mac80211/mesh_hwmp.c

+7 −0
Original line number Diff line number Diff line
@@ -1103,7 +1103,14 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata) 
	mesh_path_sel_frame_tx(MPATH_PREQ, 0, sdata->vif.addr, ifmsh->sn,

			       target_flags, mpath->dst, mpath->sn, da, 0,

			       ttl, lifetime, 0, ifmsh->preq_id++, sdata);



	spin_lock_bh(&mpath->state_lock);

	if (mpath->flags & MESH_PATH_DELETED) {

		spin_unlock_bh(&mpath->state_lock);

		goto enddiscovery;

	}

	mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout);

	spin_unlock_bh(&mpath->state_lock);



enddiscovery:

	rcu_read_unlock();

net/wireless/core.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, 
	if (result)

		return result;



	if (rdev->wiphy.debugfsdir)

	if (!IS_ERR_OR_NULL(rdev->wiphy.debugfsdir))

		debugfs_rename(rdev->wiphy.debugfsdir->d_parent,

			       rdev->wiphy.debugfsdir,

			       rdev->wiphy.debugfsdir->d_parent, newname);

CRA Git | Maintained and supported by SUSTech CRA and CCSE