From patchwork Sat Oct 17 23:01:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Mcquade X-Patchwork-Id: 7423721 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3DC2CBEEA4 for ; Sat, 17 Oct 2015 23:03:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 588E920741 for ; Sat, 17 Oct 2015 23:03:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 67C4E2073F for ; Sat, 17 Oct 2015 23:03:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969AbbJQXCV (ORCPT ); Sat, 17 Oct 2015 19:02:21 -0400 Received: from mail-wi0-f195.google.com ([209.85.212.195]:33549 "EHLO mail-wi0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbbJQXB4 (ORCPT ); Sat, 17 Oct 2015 19:01:56 -0400 Received: by wiut4 with SMTP id t4so9593610wiu.0; Sat, 17 Oct 2015 16:01:55 -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:in-reply-to:references; bh=tsaY4ymFiGgst/ESZzkwZIOz2IHdf9rb3R/7dVEHX4k=; b=UkR9UctNtBPFTpWz0j8ucby9Xyw+hk+hUF7tvw+Geg3KaRMggmD/bI3PwwDLP468Qj FOMpt9X3WVc10ZPp2lXarJdJkdx6YHb58Csj6ldEvtVJVFVrtITpFbcGkLo6PFJ3qI3q 2tG22oBm/t+MgpBj7h18vXH6gi5g/nQt5dWe0GRtKUs2nsU9/Ym3BBUIGsQRpJNiKnxN 5wXaDjzceqqzmv+2agZsobzfk/xG4GRBcEyFjDuvpgv2iP0RCoDdvjsdUoVBXVEgVR/T 8jfh5THGeaJjidkXwIlFCdOdySQU6UcGgRofyYV1Y+vvkA5Op44KgKszOn8aO6z3ixtU CTdw== X-Received: by 10.194.123.168 with SMTP id mb8mr24744580wjb.108.1445122915513; Sat, 17 Oct 2015 16:01:55 -0700 (PDT) Received: from localhost.localdomain ([78.17.77.116]) by smtp.gmail.com with ESMTPSA id wx10sm30737666wjb.40.2015.10.17.16.01.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 17 Oct 2015 16:01:54 -0700 (PDT) From: Paul McQuade To: paulmcquad@gmail.com Cc: kvalo@codeaurora.org, zajec5@gmail.com, johannes.berg@intel.com, davem@davemloft.net, joe@perches.com, m@bues.ch, mike.looijmans@topic.nl, cengelma@gmx.at, khoroshilov@ispras.ru, linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] net: wireless: b43: Fixed Pointer issue Date: Sun, 18 Oct 2015 00:01:37 +0100 Message-Id: <1445122898-5810-2-git-send-email-paulmcquad@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445122898-5810-1-git-send-email-paulmcquad@gmail.com> References: <1445122898-5810-1-git-send-email-paulmcquad@gmail.com> 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=unavailable 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 Moved around pointer to avoid ERROR Signed-off-by: Paul McQuade --- drivers/net/wireless/b43/dma.h | 14 +++++++------- drivers/net/wireless/b43/main.c | 6 +++--- drivers/net/wireless/b43/main.h | 2 +- drivers/net/wireless/b43/xmit.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) enum b43_dmatype { diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 2849070..040caa4 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -364,7 +364,7 @@ static struct ieee80211_supported_band b43_band_2ghz_limited = { static void b43_wireless_core_exit(struct b43_wldev *dev); static int b43_wireless_core_init(struct b43_wldev *dev); -static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev); +static struct b43_wldev *b43_wireless_core_stop(struct b43_wldev *dev); static int b43_wireless_core_start(struct b43_wldev *dev); static void b43_op_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, @@ -989,7 +989,7 @@ static void do_key_write(struct b43_wldev *dev, * 0xffffffff and let's b43_op_update_tkip_key provide a * correct pair. */ - rx_tkip_phase1_write(dev, index, 0xffffffff, (u16*)buf); + rx_tkip_phase1_write(dev, index, 0xffffffff, (u16 *)buf); } else if (index >= pairwise_keys_start) /* clear it */ rx_tkip_phase1_write(dev, index, 0, NULL); if (key) @@ -4334,7 +4334,7 @@ out_unlock: /* Locking: wl->mutex * Returns the current dev. This might be different from the passed in dev, * because the core might be gone away while we unlocked the mutex. */ -static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev) +static struct b43_wldev *b43_wireless_core_stop(struct b43_wldev *dev) { struct b43_wl *wl; struct b43_wldev *orig_dev; diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h index c46430c..fa56b22 100644 --- a/drivers/net/wireless/b43/main.h +++ b/drivers/net/wireless/b43/main.h @@ -73,7 +73,7 @@ static inline int b43_is_ofdm_rate(int rate) u8 b43_ieee80211_antenna_sanitize(struct b43_wldev *dev, u8 antenna_nr); -void b43_tsf_read(struct b43_wldev *dev, u64 * tsf); +void b43_tsf_read(struct b43_wldev *dev, u64 *tsf); void b43_tsf_write(struct b43_wldev *dev, u64 tsf); u32 b43_shm_read32(struct b43_wldev *dev, u16 routing, u16 offset); diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h index ba61153..fed8657 100644 --- a/drivers/net/wireless/b43/xmit.h +++ b/drivers/net/wireless/b43/xmit.h @@ -203,7 +203,7 @@ size_t b43_txhdr_size(struct b43_wldev *dev) int b43_generate_txhdr(struct b43_wldev *dev, - u8 * txhdr, + u8 *txhdr, struct sk_buff *skb_frag, struct ieee80211_tx_info *txctl, u16 cookie);