From patchwork Fri May 15 21:33:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 6416841 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 2E4829F444 for ; Fri, 15 May 2015 21:33:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 511D7204AF for ; Fri, 15 May 2015 21:33:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DA8820573 for ; Fri, 15 May 2015 21:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934450AbbEOVdS (ORCPT ); Fri, 15 May 2015 17:33:18 -0400 Received: from mail-oi0-f47.google.com ([209.85.218.47]:34335 "EHLO mail-oi0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932217AbbEOVdP (ORCPT ); Fri, 15 May 2015 17:33:15 -0400 Received: by oiko83 with SMTP id o83so92475489oik.1; Fri, 15 May 2015 14:33:15 -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=eKXn4TCcC5x457cMMkTcTLUQMjjRFHPATgJ5W8BOAsk=; b=AXLIPkzUq3bLEyWImhpoBWKrYpMtqDjtLLZNzM2Rd1OS+G6cnSSv3uPNC16xQfm/R9 yZLeFHga1gTNRAlidXEaFQBA4RFfemv62CvWzE/KiXbz7o7x5BctRHOF8DDZFtAjlyjm m7F1XIBpkXs+SZbTPCGi7Gsc0+zzgq02gt1sC3ILOV+7gAulxvwMmMoDenQm10ZQlW+5 zJV09Ej+9aYvBt+gIagjzKjpmwQ4nyQaKvyO7TOF8e4rRUPWTRFX+tgK6ED6V3xh2/mF QQa1o2ifmaVH5MUh/GdrXQFI8MteouTqG24DMFDIW1lgM3OoKEYADtAbMHhrtEh1ZGmb cYhg== X-Received: by 10.60.155.42 with SMTP id vt10mr10009565oeb.21.1431725595132; Fri, 15 May 2015 14:33:15 -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.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 May 2015 14:33:14 -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 2/5] rtlwifi: rtl8188ee: Apply the new regulatory information Date: Fri, 15 May 2015 16:33:00 -0500 Message-Id: <1431725583-7324-3-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 from EEPROM. Signed-off-by: Shao Fu Signed-off-by: Larry Finger --- drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index 86ce5b1..40c65b7 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c @@ -1919,8 +1919,8 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) "dev_addr: %pM\n", rtlefuse->dev_addr); /*channel plan */ rtlefuse->eeprom_channelplan = 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*/ _rtl88ee_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,