Skip to content

Commit 9844627

Browse files
committed
wifi: mac80211: remove DISALLOW_PUNCTURING_5GHZ code
Since iwlwifi was the only driver using this and no longer does, we can remove all this code. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://patch.msgid.link/20250609213231.4dff5fb8890f.Ie531f912b252a0042c18c0734db50c3afe1adfb5@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent afebe19 commit 9844627

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

include/net/mac80211.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2852,8 +2852,6 @@ struct ieee80211_txq {
28522852
*
28532853
* @IEEE80211_HW_DISALLOW_PUNCTURING: HW requires disabling puncturing in EHT
28542854
* and connecting with a lower bandwidth instead
2855-
* @IEEE80211_HW_DISALLOW_PUNCTURING_5GHZ: HW requires disabling puncturing in
2856-
* EHT in 5 GHz and connecting with a lower bandwidth instead
28572855
*
28582856
* @IEEE80211_HW_HANDLES_QUIET_CSA: HW/driver handles quieting for CSA, so
28592857
* no need to stop queues. This really should be set by a driver that
@@ -2923,7 +2921,6 @@ enum ieee80211_hw_flags {
29232921
IEEE80211_HW_DETECTS_COLOR_COLLISION,
29242922
IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX,
29252923
IEEE80211_HW_DISALLOW_PUNCTURING,
2926-
IEEE80211_HW_DISALLOW_PUNCTURING_5GHZ,
29272924
IEEE80211_HW_HANDLES_QUIET_CSA,
29282925
IEEE80211_HW_STRICT,
29292926

net/mac80211/debugfs.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
66
* Copyright 2013-2014 Intel Mobile Communications GmbH
7-
* Copyright (C) 2018 - 2019, 2021-2024 Intel Corporation
7+
* Copyright (C) 2018 - 2019, 2021-2025 Intel Corporation
88
*/
99

1010
#include <linux/debugfs.h>
@@ -490,7 +490,6 @@ static const char *hw_flag_names[] = {
490490
FLAG(DETECTS_COLOR_COLLISION),
491491
FLAG(MLO_MCAST_MULTI_LINK_TX),
492492
FLAG(DISALLOW_PUNCTURING),
493-
FLAG(DISALLOW_PUNCTURING_5GHZ),
494493
FLAG(HANDLES_QUIET_CSA),
495494
FLAG(STRICT),
496495
#undef FLAG

net/mac80211/mlme.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -776,10 +776,6 @@ static bool ieee80211_chandef_usable(struct ieee80211_sub_if_data *sdata,
776776
ieee80211_hw_check(&sdata->local->hw, DISALLOW_PUNCTURING))
777777
return false;
778778

779-
if (chandef->punctured && chandef->chan->band == NL80211_BAND_5GHZ &&
780-
ieee80211_hw_check(&sdata->local->hw, DISALLOW_PUNCTURING_5GHZ))
781-
return false;
782-
783779
return true;
784780
}
785781

0 commit comments

Comments
 (0)