From patchwork Wed Mar 26 19:59:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Merello X-Patchwork-Id: 3894971 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 E4DB79F2E8 for ; Wed, 26 Mar 2014 19:58:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D5762021F for ; Wed, 26 Mar 2014 19:58:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 463EC2021C for ; Wed, 26 Mar 2014 19:58:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756230AbaCZT6T (ORCPT ); Wed, 26 Mar 2014 15:58:19 -0400 Received: from mail-ee0-f43.google.com ([74.125.83.43]:64843 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755645AbaCZT6Q (ORCPT ); Wed, 26 Mar 2014 15:58:16 -0400 Received: by mail-ee0-f43.google.com with SMTP id e53so2074465eek.2 for ; Wed, 26 Mar 2014 12:58:15 -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; bh=nT8dcliPJQFCuRVdG02oTA3GgXg8SSVmYlv2Tvd7lvk=; b=EmHA7Km5g8r/uqAkFUyjH69Kqcnvjp3oC/WQ+nizCV5rSFFt4pcg/7+tlrQFKj167z rZpupuU5tFkkxF3hMyCPDTKBROn9yoz5UZJgEC/rXvefAUXbfLS3Cv8ubE/qStEln7y9 V0H0PlCHx4g3tPGD2gHbdRgZniUJhK8H/ffuH1MVCbk/ymY//xuTPQsSjn1rKokPkBbE UDNXN37/dXoBPcTWLxJILDYQrJqISElCeDzmSy4CV6ci0ArLhXetLsg25eTgyiyqAhmt drkc6XGcxxSG+m2EreRInVgQNv8n/P9yuMeHqSzf2a93QZJNf8VlRoHh/hWTLctXPF4N njeQ== X-Received: by 10.14.105.4 with SMTP id j4mr63999522eeg.41.1395863895650; Wed, 26 Mar 2014 12:58:15 -0700 (PDT) Received: from localhost.localdomain (host179-124-dynamic.6-79-r.retail.telecomitalia.it. [79.6.124.179]) by mx.google.com with ESMTPSA id o4sm49245936eef.20.2014.03.26.12.58.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 12:58:15 -0700 (PDT) From: Andrea Merello To: linville@tuxdriver.com Cc: andrea.merello@gmail.com, linux-wireless@vger.kernel.org, Larry.Finger@lwfinger.net, bernhard@schiffner-limbach.de, dan.carpenter@oracle.com Subject: [PATCH 04/20] rtl8180: add basic rate configuration support for rtl8187se Date: Wed, 26 Mar 2014 20:59:25 +0100 Message-Id: <1395863965-4487-1-git-send-email-andrea.merello@gmail.com> X-Mailer: git-send-email 1.8.3.2 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.2 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 Basic rate configuration is a bit different for rtl8187se. Adding this also fixes the gcc warning introduced in last patch about unhandled case in switch. Signed-off-by: Andrea Merello --- drivers/net/wireless/rtl818x/rtl8180/dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 767e104..6b237ed 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -412,7 +412,6 @@ static void rtl8180_conf_basic_rates(struct ieee80211_hw *dev, reg &= ~3; reg |= max; rtl818x_iowrite16(priv, &priv->map->BRSR, reg); - break; case RTL818X_CHIP_FAMILY_RTL8185: @@ -420,6 +419,11 @@ static void rtl8180_conf_basic_rates(struct ieee80211_hw *dev, rtl818x_iowrite16(priv, &priv->map->BRSR, rates_mask); rtl818x_iowrite8(priv, &priv->map->RESP_RATE, (max << 4) | min); break; + + case RTL818X_CHIP_FAMILY_RTL8187SE: + /* in 8187se this is a BITMAP */ + rtl818x_iowrite16(priv, &priv->map->BRSR_8187SE, rates_mask); + break; } }