lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 126/266] mt76: connac: fix the maximum interval schedule scan can support
    Date
    From: Sean Wang <sean.wang@mediatek.com>

    [ Upstream commit abded041a07467c2f3dfe10afd9ea10572c63cc9 ]

    Maximum interval (in seconds) for schedule scan plan supported by
    the offload firmware can be U16_MAX.

    Signed-off-by: Sean Wang <sean.wang@mediatek.com>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7615/init.c | 2 +-
    drivers/net/wireless/mediatek/mt76/mt76_connac.h | 3 ++-
    drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
    drivers/net/wireless/mediatek/mt76/mt7921/init.c | 2 +-
    4 files changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
    index d20f05a7717d..0d01fd3c77b5 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
    @@ -362,7 +362,7 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)
    wiphy->reg_notifier = mt7615_regd_notifier;

    wiphy->max_sched_scan_plan_interval =
    - MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL;
    + MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL;
    wiphy->max_sched_scan_ie_len = IEEE80211_MAX_DATA_LEN;
    wiphy->max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN;
    wiphy->max_sched_scan_ssids = MT76_CONNAC_MAX_SCHED_SCAN_SSID;
    diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
    index c26cfef425ed..75223b6e1c87 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
    +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
    @@ -7,7 +7,8 @@
    #include "mt76.h"

    #define MT76_CONNAC_SCAN_IE_LEN 600
    -#define MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL 10
    +#define MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL 10
    +#define MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL U16_MAX
    #define MT76_CONNAC_MAX_SCHED_SCAN_SSID 10
    #define MT76_CONNAC_MAX_SCAN_MATCH 16

    diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    index 0450d8c1c181..facebed1e301 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
    @@ -770,7 +770,7 @@ struct mt76_connac_sched_scan_req {
    u8 intervals_num;
    u8 scan_func; /* MT7663: BIT(0) eable random mac address */
    struct mt76_connac_mcu_scan_channel channels[64];
    - __le16 intervals[MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL];
    + __le16 intervals[MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL];
    union {
    struct {
    u8 random_mac[ETH_ALEN];
    diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
    index 2cb0252e63b2..db7e436076b3 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
    @@ -93,7 +93,7 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)
    wiphy->max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN;
    wiphy->max_scan_ssids = 4;
    wiphy->max_sched_scan_plan_interval =
    - MT76_CONNAC_MAX_SCHED_SCAN_INTERVAL;
    + MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL;
    wiphy->max_sched_scan_ie_len = IEEE80211_MAX_DATA_LEN;
    wiphy->max_sched_scan_ssids = MT76_CONNAC_MAX_SCHED_SCAN_SSID;
    wiphy->max_match_sets = MT76_CONNAC_MAX_SCAN_MATCH;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-15 21:35    [W:4.059 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site