History

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 ====================

David S. Miller committed 6 years ago

Commit 1a6da4f2 parents 15c9738 0bbab5f3 files · +9 −2Browse files

Unified · Split

3 files
  1. include/linux/ieee80211.h +1 −1
  2. net/mac80211/mesh_hwmp.c +7 −0
  3. net/wireless/core.c +1 −1
include/linux/ieee80211.h+1−1
@@ -2047,7 +2047,7 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) · 2046 unmodified lines
2047}2047}
2048 2048
2049/* HE Operation defines */2049/* HE Operation defines */
2050#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x000000032050#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x00000007
2051#define IEEE80211_HE_OPERATION_TWT_REQUIRED 0x000000082051#define IEEE80211_HE_OPERATION_TWT_REQUIRED 0x00000008
2052#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK 0x00003ff02052#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK 0x00003ff0
2053#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET 42053#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET 4
net/mac80211/mesh_hwmp.c+7−0
@@ -1103,7 +1103,14 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata) · 1102 unmodified lines
1103 mesh_path_sel_frame_tx(MPATH_PREQ, 0, sdata->vif.addr, ifmsh->sn,1103 mesh_path_sel_frame_tx(MPATH_PREQ, 0, sdata->vif.addr, ifmsh->sn,
1104 target_flags, mpath->dst, mpath->sn, da, 0,1104 target_flags, mpath->dst, mpath->sn, da, 0,
1105 ttl, lifetime, 0, ifmsh->preq_id++, sdata);1105 ttl, lifetime, 0, ifmsh->preq_id++, sdata);
1106
1107 spin_lock_bh(&mpath->state_lock);
1108 if (mpath->flags & MESH_PATH_DELETED) {
1109 spin_unlock_bh(&mpath->state_lock);
1110 goto enddiscovery;
1111 }
1106 mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout);1112 mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout);
1113 spin_unlock_bh(&mpath->state_lock);
1107 1114
1108enddiscovery:1115enddiscovery:
1109 rcu_read_unlock();1116 rcu_read_unlock();
net/wireless/core.c+1−1
@@ -142,7 +142,7 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, · 141 unmodified lines
142 if (result)142 if (result)
143 return result;143 return result;
144 144
145 if (rdev->wiphy.debugfsdir)145 if (!IS_ERR_OR_NULL(rdev->wiphy.debugfsdir))
146 debugfs_rename(rdev->wiphy.debugfsdir->d_parent,146 debugfs_rename(rdev->wiphy.debugfsdir->d_parent,
147 rdev->wiphy.debugfsdir,147 rdev->wiphy.debugfsdir,
148 rdev->wiphy.debugfsdir->d_parent, newname);148 rdev->wiphy.debugfsdir->d_parent, newname);