From patchwork Sat Jun 14 13:52:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jahnavi Meher X-Patchwork-Id: 4352571 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 3A78FBEEAA for ; Sat, 14 Jun 2014 13:53:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67CB320222 for ; Sat, 14 Jun 2014 13:53:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00D6420263 for ; Sat, 14 Jun 2014 13:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754783AbaFNNxK (ORCPT ); Sat, 14 Jun 2014 09:53:10 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:52294 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754781AbaFNNxH (ORCPT ); Sat, 14 Jun 2014 09:53:07 -0400 Received: by mail-pb0-f43.google.com with SMTP id um1so423153pbc.16 for ; Sat, 14 Jun 2014 06:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=RLUtAvDKHuqpUenj4ivuJbM2Hnwd5p+rw4oIWT/vZxQ=; b=szsqr3pJ/7od1Sp89SpvJX9FuzD49wEy/pbTEdZJ8n34XG1U/D5rnPEc07UV+Ehc33 GCzSpAGDfAU2BOyHAYrEgqn+3LOciX6pb2x03yPhr0mCh4hAg8VAPC07/u5OJfGH+F38 zXqPnBFKYoLIk+mn2/HKEE9Xxm8LPWuY+vGrGHv7zrcL4XbcKWmDKa9P6EQ+xBdvNKiT A5x9smoaI+ZTS/Z3ZcVOnxMKNyjNCc9sL3ePoccJcuoAPrg6/Bvwgv6tCmn3/6Q8XC2l E8cJ3M1JNenXyspZqbQQIDUGNSZvnk7kzEDjECWYCyismgWXECL/YnH8s8ZytjATQ4Gy 1ijQ== X-Received: by 10.68.189.137 with SMTP id gi9mr10951717pbc.79.1402753986980; Sat, 14 Jun 2014 06:53:06 -0700 (PDT) Received: from localhost.localdomain ([115.248.87.14]) by mx.google.com with ESMTPSA id ga1sm8997937pbb.82.2014.06.14.06.53.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 14 Jun 2014 06:53:06 -0700 (PDT) From: Jahnavi Meher To: Subject: [PATCH 09/16] rsi: Use SGI if configured for fixed rate transmission. Date: Sat, 14 Jun 2014 19:22:57 +0530 Message-Id: <1402753977-14104-1-git-send-email-jahnavi.meher@gmail.com> X-Mailer: git-send-email 1.7.1 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 Use SGI if configured while sending data packets at a fixed rate. Signed-off-by: Jahnavi Meher --- drivers/net/wireless/rsi/rsi_91x_pkt.c | 6 ++++++ drivers/net/wireless/rsi/rsi_mgmt.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_pkt.c b/drivers/net/wireless/rsi/rsi_91x_pkt.c index 8e48e72..229ef3a 100644 --- a/drivers/net/wireless/rsi/rsi_91x_pkt.c +++ b/drivers/net/wireless/rsi/rsi_91x_pkt.c @@ -81,6 +81,12 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) /* Send fixed rate */ frame_desc[3] = cpu_to_le16(RATE_INFO_ENABLE); frame_desc[4] = cpu_to_le16(common->min_rate); + if (common->vif_info[0].sgi) { + if (common->min_rate & 0x100) /* Only MCS rates */ + frame_desc[4] |= + cpu_to_le16(ENABLE_SHORTGI_RATE); + } + } frame_desc[6] |= cpu_to_le16(seq_num & 0xfff); diff --git a/drivers/net/wireless/rsi/rsi_mgmt.h b/drivers/net/wireless/rsi/rsi_mgmt.h index 6ccf9d9..8bff664 100644 --- a/drivers/net/wireless/rsi/rsi_mgmt.h +++ b/drivers/net/wireless/rsi/rsi_mgmt.h @@ -69,6 +69,7 @@ #define RSI_LMAC_CLOCK_80MHZ 0x1 #define RSI_ENABLE_40MHZ (0x1 << 3) +#define ENABLE_SHORTGI_RATE BIT(9) #define RX_BA_INDICATION 1 #define RSI_TBL_SZ 40