From patchwork Mon Jan 19 18:24:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 5660271 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 923B49F358 for ; Mon, 19 Jan 2015 18:24:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA83C20364 for ; Mon, 19 Jan 2015 18:24:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80AEB20108 for ; Mon, 19 Jan 2015 18:24:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752087AbbASSYz (ORCPT ); Mon, 19 Jan 2015 13:24:55 -0500 Received: from mail-wi0-f180.google.com ([209.85.212.180]:43493 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751996AbbASSYz (ORCPT ); Mon, 19 Jan 2015 13:24:55 -0500 Received: by mail-wi0-f180.google.com with SMTP id bs8so18151648wib.1 for ; Mon, 19 Jan 2015 10:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=wGUp//LlBIqVc4l0mhIueAnYkfkF6HR0GDMAEuQ241o=; b=c+EOsq/pc6e8Ekiid8J/zxyacvKX+SpmmZzUPlMOSRb3sSRmuMcS6qJTtAq1kleUj3 rYdSbfKvHvYwsZREImtUfHr4JAOlrdP86uOBevJ1e1IoKOhr3QDcdfsV6+sXQxQQ2pXu lST7ACOw3lc4K0tU5onNaP60lb3GLNQYvcMTLoxDIk/7oaTWTzZmiE9rzZ1xvF+1XQhQ kn+PPxsxB+T1rrBY5c0XPwDmxXU/lQ8uO2zwHZLy4ljw0HKakaGtJcKUaNZZWSUeKyg6 pgqwZ9eiV3Cht83LUkE/PuvVvwKEIHIy/by6SpLKNWe/BS0oV0H+4fclKLcTuXrJvMKq LU2g== X-Received: by 10.180.109.79 with SMTP id hq15mr36301605wib.47.1421691893802; Mon, 19 Jan 2015 10:24:53 -0800 (PST) Received: from tipsey.3.home ([92.40.107.9]) by mx.google.com with ESMTPSA id j1sm18224728wjw.25.2015.01.19.10.24.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 10:24:52 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 1/6] staging: vt6655: set_channel replace parameter with ieee80211_channel Date: Mon, 19 Jan 2015 18:24:10 +0000 Message-Id: <1421691855-2927-1-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.1.0 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 replacing uConnectionChannel for hw_value as set in vnt_init_bands. This allows other signaling of ieee80211_channel to move deeper into driver. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/channel.c | 12 ++++++------ drivers/staging/vt6655/channel.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index d593f5f..3fc09f4 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -174,12 +174,12 @@ void vnt_init_bands(struct vnt_private *priv) * Return Value: true if succeeded; false if failed. * */ -bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) +bool set_channel(void *pDeviceHandler, struct ieee80211_channel *ch) { struct vnt_private *pDevice = pDeviceHandler; bool bResult = true; - if (pDevice->byCurrentCh == uConnectionChannel) + if (pDevice->byCurrentCh == ch->hw_value) return bResult; /* Set VGA to max sensitivity */ @@ -197,15 +197,15 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) if (pDevice->byRFType == RF_AIROHA7230) RFbAL7230SelectChannelPostProcess(pDevice, pDevice->byCurrentCh, - (unsigned char)uConnectionChannel); + (unsigned char)ch->hw_value); - pDevice->byCurrentCh = (unsigned char)uConnectionChannel; + pDevice->byCurrentCh = (unsigned char)ch->hw_value; bResult &= RFbSelectChannel(pDevice, pDevice->byRFType, - (unsigned char)uConnectionChannel); + (unsigned char)ch->hw_value); /* Init Synthesizer Table */ if (pDevice->bEnablePSMode) - RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, uConnectionChannel); + RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, ch->hw_value); BBvSoftwareReset(pDevice); diff --git a/drivers/staging/vt6655/channel.h b/drivers/staging/vt6655/channel.h index 4f4264e..e2be6fc 100644 --- a/drivers/staging/vt6655/channel.h +++ b/drivers/staging/vt6655/channel.h @@ -27,6 +27,6 @@ void vnt_init_bands(struct vnt_private *); -bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel); +bool set_channel(void *pDeviceHandler, struct ieee80211_channel *); #endif /* _CHANNEL_H_ */ diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index c755ec2..b010184 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1420,7 +1420,7 @@ static int vnt_config(struct ieee80211_hw *hw, u32 changed) if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || (conf->flags & IEEE80211_CONF_OFFCHANNEL)) { - set_channel(priv, conf->chandef.chan->hw_value); + set_channel(priv, conf->chandef.chan); if (conf->chandef.chan->band == IEEE80211_BAND_5GHZ) bb_type = BB_TYPE_11A;