lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 111/261] mt76: avoid rx reorder buffer overflow
    Date
    From: Ryder Lee <ryder.lee@mediatek.com>

    [ Upstream commit 7c4f744d6703757be959f521a7a441bf34745d99 ]

    Enlarge slot to support 11ax 256 BA (256 MPDUs in an AMPDU)

    Signed-off-by: Chih-Min Chen <chih-min.chen@mediatek.com>
    Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/agg-rx.c | 8 ++++----
    drivers/net/wireless/mediatek/mt76/mt76.h | 6 +++---
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
    index 8f3d36a15e17..cbff0dfc9631 100644
    --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
    +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
    @@ -143,8 +143,8 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
    struct ieee80211_sta *sta;
    struct mt76_rx_tid *tid;
    bool sn_less;
    - u16 seqno, head, size;
    - u8 ackp, idx;
    + u16 seqno, head, size, idx;
    + u8 ackp;

    __skb_queue_tail(frames, skb);

    @@ -230,7 +230,7 @@ out:
    }

    int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno,
    - u16 ssn, u8 size)
    + u16 ssn, u16 size)
    {
    struct mt76_rx_tid *tid;

    @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(mt76_rx_aggr_start);

    static void mt76_rx_aggr_shutdown(struct mt76_dev *dev, struct mt76_rx_tid *tid)
    {
    - u8 size = tid->size;
    + u16 size = tid->size;
    int i;

    cancel_delayed_work(&tid->reorder_work);
    diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
    index 502814c26b33..52a16b42dfd7 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76.h
    +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
    @@ -240,8 +240,8 @@ struct mt76_rx_tid {
    struct delayed_work reorder_work;

    u16 head;
    - u8 size;
    - u8 nframes;
    + u16 size;
    + u16 nframes;

    u8 started:1, stopped:1, timer_pending:1;

    @@ -723,7 +723,7 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx,
    void mt76_set_stream_caps(struct mt76_dev *dev, bool vht);

    int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid,
    - u16 ssn, u8 size);
    + u16 ssn, u16 size);
    void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid);

    void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 18:06    [W:4.636 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site