lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 232/252] iwlwifi: mvm: Fix umac scan request probe parameters
    Date
    From: Ilan Peer <ilan.peer@intel.com>

    [ Upstream commit 35fc5feca7b24b97e828e6e6a4243b4b9b0131f8 ]

    Both 'iwl_scan_probe_params_v3' and 'iwl_scan_probe_params_v4'
    wrongly addressed the 'bssid_array' field which should supposed
    to be any array of BSSIDs each of size ETH_ALEN and not the
    opposite. Fix it.

    Signed-off-by: Ilan Peer <ilan.peer@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Link: https://lore.kernel.org/r/iwlwifi.20210802215208.04146f24794f.I90726440ddff75013e9fecbe9fa1a05c69e3f17b@changeid
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
    index b2605aefc290..8b200379f7c2 100644
    --- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
    +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
    @@ -1,6 +1,6 @@
    /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
    /*
    - * Copyright (C) 2012-2014, 2018-2020 Intel Corporation
    + * Copyright (C) 2012-2014, 2018-2021 Intel Corporation
    * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
    * Copyright (C) 2016-2017 Intel Deutschland GmbH
    */
    @@ -874,7 +874,7 @@ struct iwl_scan_probe_params_v3 {
    u8 reserved;
    struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
    __le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];
    - u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];
    + u8 bssid_array[SCAN_BSSID_MAX_SIZE][ETH_ALEN];
    } __packed; /* SCAN_PROBE_PARAMS_API_S_VER_3 */

    /**
    @@ -894,7 +894,7 @@ struct iwl_scan_probe_params_v4 {
    __le16 reserved;
    struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
    __le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];
    - u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];
    + u8 bssid_array[SCAN_BSSID_MAX_SIZE][ETH_ALEN];
    } __packed; /* SCAN_PROBE_PARAMS_API_S_VER_4 */

    #define SCAN_MAX_NUM_CHANS_V3 67
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 14:05    [W:4.169 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site