From patchwork Fri May 15 21:33:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 6416801 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B76699F318 for ; Fri, 15 May 2015 21:33:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6D012056E for ; Fri, 15 May 2015 21:33:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11D6D20573 for ; Fri, 15 May 2015 21:33:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934863AbbEOVdY (ORCPT ); Fri, 15 May 2015 17:33:24 -0400 Received: from mail-ob0-f170.google.com ([209.85.214.170]:35422 "EHLO mail-ob0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934194AbbEOVdR (ORCPT ); Fri, 15 May 2015 17:33:17 -0400 Received: by obcus9 with SMTP id us9so87514621obc.2; Fri, 15 May 2015 14:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pd3iwte8o1/Y4o2lu4Y/wvuOowKQimIsoO9YjwtaGB0=; b=I7CMJDDDpm9LdALyjYI1ZwT5iqXbq5L78fUZ/B5tD/8JbXbGaDXlnWyUjIUXWsgiOq 7oxcQmc+UNZs7tNmorsHK6OMZ6nuXOo66ht3CAaxT3g0bPUZFhDh8Y+zMigJhd6tnguD rHPJTr4I39JswAyMJtGwavzyl2vQXEptlSQIPQLtk6La2FtCLsrDtb4JT9gPwaZR8zu7 gzYLFHdtkHQNAxkdef28a0WGqlmkWjGcn1zHbbUOM1ffMWqT71QnPWk2xIh7CV5NVreC guX0vW/XmXSPWcHQfh7HztBTiP/UnAb98Wde8vERGF0n8YZMCrpfLv0NgrcZOKyabIXH FUFg== X-Received: by 10.182.128.6 with SMTP id nk6mr10195948obb.70.1431725597027; Fri, 15 May 2015 14:33:17 -0700 (PDT) Received: from linux.site.site (cpe-72-133-230-77.kc.res.rr.com. [72.133.230.77]) by mx.google.com with ESMTPSA id xs4sm1554712obc.12.2015.05.15.14.33.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 May 2015 14:33:16 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Shao Fu , netdev@vger.kernel.org, Larry Finger Subject: [PATCH 3/5] rtlwifi: rtl8192ee: Apply the regulatory changes to driver Date: Fri, 15 May 2015 16:33:01 -0500 Message-Id: <1431725583-7324-4-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1431725583-7324-1-git-send-email-Larry.Finger@lwfinger.net> References: <1431725583-7324-1-git-send-email-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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: Shao Fu The driver was setting a channel plan for the world. Now it reads it fromi EEPROM. In addition, a typo was fixed. Signed-off-by: Shao Fu Signed-off-by: Larry Finger --- drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c index da0a612..0705e7e 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c @@ -2194,8 +2194,8 @@ static void _rtl92ee_read_adapter_info(struct ieee80211_hw *hw) "dev_addr: %pM\n", rtlefuse->dev_addr); /*channel plan */ rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN]; - /* set channel paln to world wide 13 */ - rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13; + /* set channel plan from efuse */ + rtlefuse->channel_plan = rtlefuse->eeprom_channelplan; /*tx power*/ _rtl92ee_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag, hwinfo);