From patchwork Wed Feb 12 19:22:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 3640201 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 51EEDBF13A for ; Wed, 12 Feb 2014 19:24:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FF64201ED for ; Wed, 12 Feb 2014 19:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F13F201CE for ; Wed, 12 Feb 2014 19:24:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753396AbaBLTYs (ORCPT ); Wed, 12 Feb 2014 14:24:48 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:36345 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753344AbaBLTYr (ORCPT ); Wed, 12 Feb 2014 14:24:47 -0500 Received: by mail-wi0-f173.google.com with SMTP id hn9so7496787wib.12 for ; Wed, 12 Feb 2014 11:24:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:content-type:date:mime-version :content-transfer-encoding; bh=NRtjvqEG4vjOWmgx1Bjiv4rZCy27oVPkrPx8jLYhQ44=; b=HQUB4JyNW6fjPn9aQAkumhoGGCBzMWd4jTE/0XxXlf8gdFXgQ3Q1WXpC5Lfbn8rZnW 6fP9hQik9euMnEVhEBqUizoI1112rxo5aYx9meiI2bQlKSyu8LSfTUmzmw2iux2G/z7n I6EYr+6XhnbODUO3yrmxlClUYpKEbi3q/qD5JtJWlZPbg4Yn8cow0K98Boeo04NmawYv 3qGE7tQq8aYCHFOz0WmwgMbYKkn8a9GrdLsEI+lIZWN40rvIF5nc4D8ozj9gE0J8Ah27 1hC+7WZirRVyzo493CfQ/a9MtZShAQnjdcE2LxfSynWMHfQHLaDlSuO2S4S20M5wrnEL Qsfg== X-Received: by 10.194.6.8 with SMTP id w8mr31584886wjw.16.1392233086443; Wed, 12 Feb 2014 11:24:46 -0800 (PST) Received: from [192.168.1.100] (188.28.137.166.threembb.co.uk. [188.28.137.166]) by mx.google.com with ESMTPSA id r1sm8015439wia.5.2014.02.12.11.24.44 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 11:24:45 -0800 (PST) Message-ID: <1392232957.4053.8.camel@canaries32-MCP7A> Subject: [PATCH 3/3] staging: vt6656: camel case and clean up devie_set_multi From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org Date: Wed, 12 Feb 2014 19:22:37 +0000 Mime-Version: 1.0 X-Mailer: Evolution 3.10.3-0ubuntu3 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.4 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 White space clean up Camel case changes pDevice -> priv pMgmt -> mgmt byTmpMode -> tmp Signed-off-by: Malcolm Priestley --- drivers/staging/vt6656/main_usb.c | 91 ++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index e682c9d..eca7d24 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -1350,62 +1350,63 @@ static int Read_config_file(struct vnt_private *pDevice) static void device_set_multi(struct net_device *dev) { - struct vnt_private *pDevice = netdev_priv(dev); - struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; + struct vnt_private *priv = netdev_priv(dev); + struct vnt_manager *mgmt = &priv->vnt_mgmt; struct netdev_hw_addr *ha; u64 mc_filter = 0; - u8 byTmpMode = 0; + u8 tmp = 0; int rc; - spin_lock_irq(&pDevice->lock); - rc = CONTROLnsRequestIn(pDevice, - MESSAGE_TYPE_READ, - MAC_REG_RCR, - MESSAGE_REQUEST_MACREG, - 1, - &byTmpMode - ); - if (rc == 0) pDevice->byRxMode = byTmpMode; - - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRxMode in= %x\n", pDevice->byRxMode); - - if (dev->flags & IFF_PROMISC) { /* set promiscuous mode */ - DBG_PRT(MSG_LEVEL_ERR,KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name); - /* unconditionally log net taps */ - pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST|RCR_UNICAST); - } - else if ((netdev_mc_count(dev) > pDevice->multicast_limit) || - (dev->flags & IFF_ALLMULTI)) { - mc_filter = ~0x0; - MACvWriteMultiAddr(pDevice, mc_filter); + spin_lock_irq(&priv->lock); - pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST); - } - else { - netdev_for_each_mc_addr(ha, dev) { - int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; + rc = CONTROLnsRequestIn(priv, MESSAGE_TYPE_READ, + MAC_REG_RCR, MESSAGE_REQUEST_MACREG, 1, &tmp); + if (rc == 0) + priv->byRxMode = tmp; + + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "priv->byRxMode in= %x\n", + priv->byRxMode); + + if (dev->flags & IFF_PROMISC) { /* set promiscuous mode */ + DBG_PRT(MSG_LEVEL_ERR, KERN_NOTICE + "%s: Promiscuous mode enabled.\n", dev->name); + /* unconditionally log net taps */ + priv->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST|RCR_UNICAST); + } else if ((netdev_mc_count(dev) > priv->multicast_limit) || + (dev->flags & IFF_ALLMULTI)) { + mc_filter = ~0x0; + MACvWriteMultiAddr(priv, mc_filter); + + priv->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST); + } else { + netdev_for_each_mc_addr(ha, dev) { + int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; - mc_filter |= 1ULL << (bit_nr & 0x3f); + mc_filter |= 1ULL << (bit_nr & 0x3f); + } + + MACvWriteMultiAddr(priv, mc_filter); + + priv->byRxMode &= ~(RCR_UNICAST); + priv->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST); } - MACvWriteMultiAddr(pDevice, mc_filter); + if (mgmt->eConfigMode == WMAC_CONFIG_AP) { + /* + * If AP mode, don't enable RCR_UNICAST since HW only compares + * addr1 with local MAC + */ + priv->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST); + priv->byRxMode &= ~(RCR_UNICAST); + } - pDevice->byRxMode &= ~(RCR_UNICAST); - pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST); - } + ControlvWriteByte(priv, MESSAGE_REQUEST_MACREG, + MAC_REG_RCR, priv->byRxMode); - if (pMgmt->eConfigMode == WMAC_CONFIG_AP) { - /* - * If AP mode, don't enable RCR_UNICAST since HW only compares - * addr1 with local MAC - */ - pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST); - pDevice->byRxMode &= ~(RCR_UNICAST); - } - ControlvWriteByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_RCR, pDevice->byRxMode); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRxMode out= %x\n", pDevice->byRxMode); - spin_unlock_irq(&pDevice->lock); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO + "priv->byRxMode out= %x\n", priv->byRxMode); + spin_unlock_irq(&priv->lock); } static struct net_device_stats *device_get_stats(struct net_device *dev)