Commit 98446275 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250609213231.4dff5fb8890f.Ie531f912b252a0042c18c0734db50c3afe1adfb5@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent afebe192

include/net/mac80211.h

+0 −3
Original line number Diff line number Diff line
@@ -2852,8 +2852,6 @@ struct ieee80211_txq { 
 *

 * @IEEE80211_HW_DISALLOW_PUNCTURING: HW requires disabling puncturing in EHT

 *	and connecting with a lower bandwidth instead

 * @IEEE80211_HW_DISALLOW_PUNCTURING_5GHZ: HW requires disabling puncturing in

 *	EHT in 5 GHz and connecting with a lower bandwidth instead

 *

 * @IEEE80211_HW_HANDLES_QUIET_CSA: HW/driver handles quieting for CSA, so

 *	no need to stop queues. This really should be set by a driver that
@@ -2923,7 +2921,6 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_DETECTS_COLOR_COLLISION,

	IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX,

	IEEE80211_HW_DISALLOW_PUNCTURING,

	IEEE80211_HW_DISALLOW_PUNCTURING_5GHZ,

	IEEE80211_HW_HANDLES_QUIET_CSA,

	IEEE80211_HW_STRICT,

net/mac80211/debugfs.c

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2018 - 2019, 2021-2024 Intel Corporation

 * Copyright (C) 2018 - 2019, 2021-2025 Intel Corporation

 */



#include <linux/debugfs.h>
@@ -490,7 +490,6 @@ static const char *hw_flag_names[] = { 
	FLAG(DETECTS_COLOR_COLLISION),

	FLAG(MLO_MCAST_MULTI_LINK_TX),

	FLAG(DISALLOW_PUNCTURING),

	FLAG(DISALLOW_PUNCTURING_5GHZ),

	FLAG(HANDLES_QUIET_CSA),

	FLAG(STRICT),

#undef FLAG

net/mac80211/mlme.c

+0 −4
Original line number Diff line number Diff line
@@ -776,10 +776,6 @@ static bool ieee80211_chandef_usable(struct ieee80211_sub_if_data *sdata, 
	    ieee80211_hw_check(&sdata->local->hw, DISALLOW_PUNCTURING))

		return false;



	if (chandef->punctured && chandef->chan->band == NL80211_BAND_5GHZ &&

	    ieee80211_hw_check(&sdata->local->hw, DISALLOW_PUNCTURING_5GHZ))

		return false;



	return true;

}