diff options
| author | Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com> | 2023-05-10 10:31:52 +0300 |
|---|---|---|
| committer | iwlwifi publisher <> | 2023-05-10 10:17:26 +0000 |
| commit | 51368967b55733e9ad74cbf4b33562a696d164ea (patch) | |
| tree | 955da2751ad31b17c8791b818b9a138a7965c59e | |
| parent | 36fb7c4ac7ce257909fd022626dbaecf2003e780 (diff) | |
| download | backport-iwlwifi-51368967b55733e9ad74cbf4b33562a696d164ea.tar.gz | |
[BUGFIX][NOUPSTREAM] wifi: iwlwifi: rfi: Modify type of "capa" variable.
Currently, enum iwl_rfi_capabilites has more than 8 bits.
Change the type of capa variable from u8 to u16.
type=bugfix
ticket=jira:WIFI-294132
fixes=I4dbfe5aa56f3b67d51fd6661f63d1111df68e31f
Change-Id: I3e21fe6c4590357e676fc49146331c011a59a359
Signed-off-by: Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/54863
automatic-review: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Greenman, Gregory <gregory.greenman@intel.com>
Tested-by: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
x-iwlwifi-stack-dev: e228a9b844b656956a0e9650b130c5553a89f31b
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-vendor-cmd.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 4 | ||||
| -rw-r--r-- | versions | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-vendor-cmd.h b/drivers/net/wireless/intel/iwlwifi/iwl-vendor-cmd.h index 5ef5e8e3f8..ff9330d8bd 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-vendor-cmd.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-vendor-cmd.h @@ -792,7 +792,7 @@ enum iwl_vendor_auth_akm_mode { * table version * @IWL_MVM_VENDOR_ATTR_SGOM_TABLE: binary attribute. * @IWL_MVM_VENDOR_ATTR_RFIM_BANDS: RFIM bands - * @IWL_MVM_VENDOR_ATTR_RFIM_CAPA: RFIM capabilities (u8) + * @IWL_MVM_VENDOR_ATTR_RFIM_CAPA: RFIM capabilities (u16) * @IWL_MVM_VENDOR_ATTR_RFIM_CHANNELS: RFIM channels * @IWL_MVM_VENDOR_ATTR_RFIM_FREQ: RFIM frequency (u16) * @IWL_MVM_VENDOR_ATTR_RFIM_INFO: overall RFIM info (nested) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c index 6e8c811f9f..6f574a0915 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c @@ -414,7 +414,7 @@ static int iwl_vendor_rfim_get_capa(struct wiphy *wiphy, struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); struct sk_buff *skb; - u8 capa = 0; + u16 capa = 0; skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 4); if (!skb) @@ -430,7 +430,7 @@ static int iwl_vendor_rfim_get_capa(struct wiphy *wiphy, if (iwl_rfi_dlvr_supported(mvm)) capa |= IWL_MVM_RFI_DLVR_CAPA; - if (nla_put_u8(skb, IWL_MVM_VENDOR_ATTR_RFIM_CAPA, capa)) { + if (nla_put_u16(skb, IWL_MVM_VENDOR_ATTR_RFIM_CAPA, capa)) { kfree_skb(skb); return -ENOBUFS; } @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11201:2192c5c5" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11202:e228a9b8" |