From patchwork Wed Apr 2 02:08:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fariyaf@gmail.com X-Patchwork-Id: 3926371 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54BB8BF540 for ; Wed, 2 Apr 2014 02:08:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8925120268 for ; Wed, 2 Apr 2014 02:08:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8CD420266 for ; Wed, 2 Apr 2014 02:08:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757540AbaDBCIZ (ORCPT ); Tue, 1 Apr 2014 22:08:25 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:61729 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756889AbaDBCIY (ORCPT ); Tue, 1 Apr 2014 22:08:24 -0400 Received: by mail-pb0-f51.google.com with SMTP id uo5so10672561pbc.24 for ; Tue, 01 Apr 2014 19:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zX0pKI7t1RhYRFpHnMSS//UJ1OOx8xDdAN0ooR4Tz84=; b=ZQmpaxYB8Rz/yXn84V9hOTE8n246BilBpl1U73AtS0C8oBpWM/cGI9EI/lj8/vg2oY J7RybnoZQ+t5dBBahellY/32lK+PFm4kx2eqwg0Y6sRpaRC+KQJxtjJru5dgyKqhUtdS xRm9llBcXzqdJj+Mcz3JKKeYIu3rHjrLndqFB07Eao/7t3j3kr33bNt6y8us3GcRmoJ1 0lWqqWDZct4BHALIGEfbCkD4/uR6Vup4vEKl0lu6mlMuk8DGjxizIvcDVP6Z9TEjx1t0 ZTtQmZLFl9s1PU7+JIl0FUaVAlZuVTegJVQdCmSjRYLgk8NLFhM/eZf0WAlDTsFe4URl gdWQ== X-Received: by 10.68.229.68 with SMTP id so4mr18533793pbc.110.1396404504252; Tue, 01 Apr 2014 19:08:24 -0700 (PDT) Received: from localhost.localdomain ([27.6.128.194]) by mx.google.com with ESMTPSA id dn1sm709612pbb.54.2014.04.01.19.08.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 19:08:23 -0700 (PDT) From: Fariya Fatima To: linux-wireless@vger.kernel.org Cc: Fariya Fatima Subject: [PATCH 5/6] rsi: Fixed issue relating to index of q_num. Date: Wed, 2 Apr 2014 07:38:04 +0530 Message-Id: <1396404485-3989-6-git-send-email-fariyaf@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1396404485-3989-1-git-send-email-fariyaf@gmail.com> References: <1396404485-3989-1-git-send-email-fariyaf@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fariya Fatima Signed-off-by: Fariya Fatima --- drivers/net/wireless/rsi/rsi_91x_core.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c index e89535e..1a8d321 100644 --- a/drivers/net/wireless/rsi/rsi_91x_core.c +++ b/drivers/net/wireless/rsi/rsi_91x_core.c @@ -102,10 +102,10 @@ static u8 rsi_core_determine_hal_queue(struct rsi_common *common) } get_queue_num: - q_num = 0; recontend_queue = false; q_num = rsi_determine_min_weight_queue(common); + q_len = skb_queue_len(&common->tx_queue[ii]); ii = q_num; @@ -118,7 +118,9 @@ get_queue_num: } } - common->tx_qinfo[q_num].pkt_contended = 0; + if (q_num < NUM_EDCA_QUEUES) + common->tx_qinfo[q_num].pkt_contended = 0; + /* Adjust the back off values for all queues again */ recontend_queue = rsi_recalculate_weights(common);