diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2021-07-05 15:04:24 +0300 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2021-07-09 00:18:14 +0300 |
| commit | 2102e75acffaa7b57cd67052217a1242d22e8a18 (patch) | |
| tree | e0f65b038314ec3207bf308241614469eb7a043c | |
| parent | a116b1e5b0d9f2acfcd2df1842c84e8427b651f8 (diff) | |
| download | chromeos-4.14__release/core63-43.tar.gz | |
CHROMIUM: iwl7000: chromeOS: update version check for cfg80211_tid_config and cfg80211_tid_cfgchromeos-4.14__release/core63-2021-07-09chromeos-4.14__release/core63-43
Google has cherry-picked the patch that implements this to
chromeos-5.4. This doesn't have any impact in iwl7000 (we don't use
these definitions), but we should apply the change anyway for
consistency.
Change-Id: I9aa3277408a6112bd059831556bc1449b4470e41
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
iwl7000-tree: 5b91da46c02dfdb7c9e30995f2a835a5bc1eaa42
| -rw-r--r-- | drivers/net/wireless/iwl7000/hdrs/mac80211-bp.h | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/iwl7000/hdrs/version.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwl7000/hdrs/mac80211-bp.h b/drivers/net/wireless/iwl7000/hdrs/mac80211-bp.h index 266ee6d3ed1755..a5a7c1c80e992b 100644 --- a/drivers/net/wireless/iwl7000/hdrs/mac80211-bp.h +++ b/drivers/net/wireless/iwl7000/hdrs/mac80211-bp.h @@ -2185,9 +2185,6 @@ enum nl80211_tid_config { NL80211_TID_CONFIG_ENABLE, NL80211_TID_CONFIG_DISABLE, }; -#endif - -#if CFG80211_VERSION < KERNEL_VERSION(5,7,0) /** * struct cfg80211_tid_cfg - TID specific configuration * @config_override: Flag to notify driver to reset TID configuration @@ -2222,7 +2219,9 @@ struct cfg80211_tid_config { u32 n_tid_conf; struct cfg80211_tid_cfg tid_conf[]; }; +#endif +#if CFG80211_VERSION < KERNEL_VERSION(5,7,0) #define NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH -1 #define NL80211_EXT_FEATURE_DEL_IBSS_STA -1 diff --git a/drivers/net/wireless/iwl7000/hdrs/version.h b/drivers/net/wireless/iwl7000/hdrs/version.h index 954f2ea38e41d0..1fe14cd55bcccc 100644 --- a/drivers/net/wireless/iwl7000/hdrs/version.h +++ b/drivers/net/wireless/iwl7000/hdrs/version.h @@ -1,6 +1,6 @@ #ifndef __IWL_CHROME_VERSION_H #define __IWL_CHROME_VERSION_H -#define BACKPORTS_GIT_TRACKED "chromium:" UTS_RELEASE ":core63:" +#define BACKPORTS_GIT_TRACKED "chromium:" UTS_RELEASE ":core63-43:" #endif /* __IWL_CHROME_VERSION_H */ |