From patchwork Wed Apr 2 03:59:54 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: 3926551 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C8D479F2F7 for ; Wed, 2 Apr 2014 04:00:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E83952024D for ; Wed, 2 Apr 2014 04:00:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2856A20240 for ; Wed, 2 Apr 2014 04:00:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751993AbaDBEA0 (ORCPT ); Wed, 2 Apr 2014 00:00:26 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:59988 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750704AbaDBEAX (ORCPT ); Wed, 2 Apr 2014 00:00:23 -0400 Received: by mail-pd0-f175.google.com with SMTP id x10so10422072pdj.6 for ; Tue, 01 Apr 2014 21:00:22 -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=MTCaFEykxmud6ulwIIDVBrjkRzhYPP4lFQoyTZKFArL02FRl6/QcjPSVKfmqjCP+3R 2+73Pcber3/xuYCGoqS8aw9ngEMj6QO632O6ZkR/XzBpCYo9ZrsCImv29IRjwq5hErIG +HTwYQKj/UwLOR8jas0mtfW0FIbqwEJ6jvorsXE8Y1I1PWkqzpwtBMQlZ9pI7ULYGYO9 e5QlU1Zu9GjpwCd8XlQ+yfQMdbK39fxnRqR4i1nndMjiW+7W6UMOl9U3D2uDlDEcNdWV 64QU6Xee+4kIpn9ssA/r3bkCYOhXwBtSCbSLR5owxPnI9XvETtD6TtMhpvbDtDwAQyxx 3IEQ== X-Received: by 10.68.229.164 with SMTP id sr4mr35119744pbc.82.1396411222888; Tue, 01 Apr 2014 21:00:22 -0700 (PDT) Received: from localhost.localdomain ([27.6.128.194]) by mx.google.com with ESMTPSA id pq3sm1161795pbb.57.2014.04.01.21.00.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 21:00:22 -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 09:29:54 +0530 Message-Id: <1396411195-5051-6-git-send-email-fariyaf@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1396411195-5051-1-git-send-email-fariyaf@gmail.com> References: <1396411195-5051-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);