lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 152/639] iwlwifi: mvm: fix A-MPDU reference assignment
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 1f7698abedeeb3fef3cbcf78e16f925df675a179 ]

    The current code assigns the reference, and then goes to increment
    it if the toggle bit has changed. That way, we get

    Toggle 0 0 0 0 1 1 1 1
    ID 1 1 1 1 1 2 2 2

    Fix that by assigning the post-toggle ID to get

    Toggle 0 0 0 0 1 1 1 1
    ID 1 1 1 1 2 2 2 2

    Reported-by: Danny Alexander <danny.alexander@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Fixes: fbe4112791b8 ("iwlwifi: mvm: update mpdu metadata API")
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
    index 036d1d82d93e7..77e3694536421 100644
    --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
    @@ -1077,7 +1077,6 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
    he_phy_data = le64_to_cpu(desc->v1.he_phy_data);

    rx_status->flag |= RX_FLAG_AMPDU_DETAILS;
    - rx_status->ampdu_reference = mvm->ampdu_ref;
    /* toggle is switched whenever new aggregation starts */
    if (toggle_bit != mvm->ampdu_toggle) {
    mvm->ampdu_ref++;
    @@ -1092,6 +1091,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
    RX_FLAG_AMPDU_EOF_BIT;
    }
    }
    + rx_status->ampdu_reference = mvm->ampdu_ref;
    }

    rcu_read_lock();
    --
    2.20.1


    \
     
     \ /
      Last update: 2022-09-17 16:07    [W:2.268 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site