From patchwork Sat Jun 14 13:51:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jahnavi Meher X-Patchwork-Id: 4352541 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 7CD55BEEAA for ; Sat, 14 Jun 2014 13:51:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F31F20222 for ; Sat, 14 Jun 2014 13:51:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C97D92021B for ; Sat, 14 Jun 2014 13:51:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754719AbaFNNvo (ORCPT ); Sat, 14 Jun 2014 09:51:44 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:50217 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515AbaFNNvn (ORCPT ); Sat, 14 Jun 2014 09:51:43 -0400 Received: by mail-pa0-f46.google.com with SMTP id eu11so3019552pac.19 for ; Sat, 14 Jun 2014 06:51:43 -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=jiGIeMeXsPmfmnjMiYMNQqSotKitQmi7pIcRbeXb/ck=; b=m1wGiQVPheS6iCXHwAqRUf+CeUzlqNCHMpEIZK6A6euLFFV5a/k9N4+JIN8wNBjibU 19tfI1vaqDufwGIGf271INbTer4yRGoplxodLMo2gGobEB4s9wsZqE/4QWlJ6qeYEZ20 aXc/iBtcJu1khCFr9j++O2AWk5z+oePBvO2uPCZc56HP6a+ORXenS8nnwfAXd0reKz3F Yus6W1xGlrVvw0vpDS4S47Qz8PVI+i5L9noGslbIbbFWXaJujNXGL5wCAwWQWoKfn7oM /FIBsuFZCYu2/pHgfJSARu5lZMwSGjyq5ZJV2S3fbgXIbL6J08zHvJqGXOxvphdWDjnP gomA== X-Received: by 10.67.22.33 with SMTP id hp1mr10781481pad.134.1402753903072; Sat, 14 Jun 2014 06:51:43 -0700 (PDT) Received: from localhost.localdomain ([115.248.87.14]) by mx.google.com with ESMTPSA id fe3sm9000107pbd.66.2014.06.14.06.51.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 14 Jun 2014 06:51:42 -0700 (PDT) From: Jahnavi Meher To: Subject: [PATCH 06/16] rsi: Changed the rsi_set_channel() and rsi_program_bb_rf(). Date: Sat, 14 Jun 2014 19:21:33 +0530 Message-Id: <1402753893-14010-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 Made required changes to rsi_set_channel() and rsi_program_bb_rf() functions. Signed-off-by: Jahnavi Meher --- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index c3d8da9..5c122e8 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -596,7 +596,7 @@ static int rsi_program_bb_rf(struct rsi_common *common) mgmt_frame->desc_word[0] = cpu_to_le16(RSI_WIFI_MGMT_Q << 12); mgmt_frame->desc_word[1] = cpu_to_le16(BBP_PROG_IN_TA); - mgmt_frame->desc_word[4] = cpu_to_le16(common->endpoint << 8); + mgmt_frame->desc_word[4] = cpu_to_le16(common->endpoint); if (common->rf_reset) { mgmt_frame->desc_word[7] = cpu_to_le16(RF_RESET_ENABLE); @@ -849,23 +849,6 @@ int rsi_set_channel(struct rsi_common *common, u16 channel) rsi_dbg(MGMT_TX_ZONE, "%s: Sending scan req frame\n", __func__); - if (common->band == IEEE80211_BAND_5GHZ) { - if ((channel >= 36) && (channel <= 64)) - channel = ((channel - 32) / 4); - else if ((channel > 64) && (channel <= 140)) - channel = ((channel - 102) / 4) + 8; - else if (channel >= 149) - channel = ((channel - 151) / 4) + 18; - else - return -EINVAL; - } else { - if (channel > 14) { - rsi_dbg(ERR_ZONE, "%s: Invalid chno %d, band = %d\n", - __func__, channel, common->band); - return -EINVAL; - } - } - skb = dev_alloc_skb(FRAME_DESC_SZ); if (!skb) { rsi_dbg(ERR_ZONE, "%s: Failed in allocation of skb\n", @@ -885,6 +868,7 @@ int rsi_set_channel(struct rsi_common *common, u16 channel) (RSI_RF_TYPE << 4)); mgmt_frame->desc_word[5] = cpu_to_le16(0x01); + mgmt_frame->desc_word[6] = cpu_to_le16(0x12); if (common->channel_width == BW_40MHZ) mgmt_frame->desc_word[5] |= cpu_to_le16(0x1 << 8);