From patchwork Tue Oct 20 05:26:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7441951 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 B5AB9BEEA4 for ; Tue, 20 Oct 2015 05:27:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B765F20680 for ; Tue, 20 Oct 2015 05:27:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C8B02064E for ; Tue, 20 Oct 2015 05:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857AbbJTF1v (ORCPT ); Tue, 20 Oct 2015 01:27:51 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:22921 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751194AbbJTF1u (ORCPT ); Tue, 20 Oct 2015 01:27:50 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Tue, 20 Oct 2015 07:27:47 +0200 From: Tony Cho To: CC: , , , , , , , , Subject: [PATCH V2 05/12] staging: wilc1000: rename aBSSID in the sturct wilc_vif Date: Tue, 20 Oct 2015 14:26:49 +0900 Message-ID: <1445318816-21686-6-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445318816-21686-1-git-send-email-tony.cho@atmel.com> References: <1445318816-21686-1-git-send-email-tony.cho@atmel.com> MIME-Version: 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This patch renames aBSSID in the struct wilc_vif to the bssid. Signed-off-by: Tony Cho --- drivers/staging/wilc1000/linux_wlan.c | 14 +++++++------- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++--- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 9d57962..493e02c 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -367,8 +367,8 @@ struct net_device *GetIfHandler(u8 *pMacHeader) Bssid1 = pMacHeader + 4; for (i = 0; i < g_linux_wlan->vif_num; i++) - if (!memcmp(Bssid1, g_linux_wlan->vif[i].aBSSID, ETH_ALEN) || - !memcmp(Bssid, g_linux_wlan->vif[i].aBSSID, ETH_ALEN)) + if (!memcmp(Bssid1, g_linux_wlan->vif[i].bssid, ETH_ALEN) || + !memcmp(Bssid, g_linux_wlan->vif[i].bssid, ETH_ALEN)) return g_linux_wlan->vif[i].wilc_netdev; PRINT_INFO(INIT_DBG, "Invalide handle\n"); @@ -377,8 +377,8 @@ struct net_device *GetIfHandler(u8 *pMacHeader) Bssid = pMacHeader + 18; Bssid1 = pMacHeader + 12; for (i = 0; i < g_linux_wlan->vif_num; i++) - if (!memcmp(Bssid1, g_linux_wlan->vif[i].aBSSID, ETH_ALEN) || - !memcmp(Bssid, g_linux_wlan->vif[i].aBSSID, ETH_ALEN)) + if (!memcmp(Bssid1, g_linux_wlan->vif[i].bssid, ETH_ALEN) || + !memcmp(Bssid, g_linux_wlan->vif[i].bssid, ETH_ALEN)) return g_linux_wlan->vif[i].wilc_netdev; PRINT_INFO(INIT_DBG, "\n"); @@ -392,7 +392,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID) for (i = 0; i < g_linux_wlan->vif_num; i++) if (g_linux_wlan->vif[i].wilc_netdev == wilc_netdev) { - memcpy(g_linux_wlan->vif[i].aBSSID, pBSSID, 6); + memcpy(g_linux_wlan->vif[i].bssid, pBSSID, 6); ret = 0; break; } @@ -408,7 +408,7 @@ int linux_wlan_get_num_conn_ifcs(void) u8 ret_val = 0; for (i = 0; i < g_linux_wlan->vif_num; i++) - if (memcmp(g_linux_wlan->vif[i].aBSSID, null_bssid, 6)) + if (memcmp(g_linux_wlan->vif[i].bssid, null_bssid, 6)) ret_val++; return ret_val; @@ -1472,7 +1472,7 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev) PRINT_D(TX_DBG, "Adding tx packet to TX Queue\n"); nic->netstats.tx_packets++; nic->netstats.tx_bytes += tx_data->size; - tx_data->pBssid = g_linux_wlan->vif[nic->u8IfIdx].aBSSID; + tx_data->pBssid = g_linux_wlan->vif[nic->u8IfIdx].bssid; QueueCount = wilc_wlan_txq_add_net_pkt((void *)tx_data, tx_data->buff, tx_data->size, linux_wlan_tx_complete); diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index b39ea18..c166d3f 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -2572,7 +2572,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, nic->iftype = STATION_MODE; if (g_linux_wlan->initialized) { - host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].aBSSID, TID); + host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID); /* ensure that the message Q is empty */ host_int_wait_msg_queue_idle(); @@ -2648,7 +2648,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, connecting = 0; PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_P2P_CLIENT\n"); - host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].aBSSID, TID); + host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID); dev->ieee80211_ptr->iftype = type; priv->wdev->iftype = type; @@ -2760,7 +2760,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*sent before downloading new FW. This is because it blocks on*/ /*hWaitResponse semaphore, which allows previous config*/ /*packets to actually take action on old FW*/ - host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].aBSSID, TID); + host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID); bEnablePS = false; PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_GO\n"); dev->ieee80211_ptr->iftype = type; diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 3089129..6ac9328 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -150,7 +150,7 @@ typedef struct { struct wilc_vif { u8 src_addr[ETH_ALEN]; - u8 aBSSID[ETH_ALEN]; + u8 bssid[ETH_ALEN]; struct host_if_drv *drvHandler; struct net_device *wilc_netdev; };