From patchwork Mon Nov 12 05:45:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10678159 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DEEB615A6 for ; Mon, 12 Nov 2018 05:45:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9737286B1 for ; Mon, 12 Nov 2018 05:45:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD2D52A046; Mon, 12 Nov 2018 05:45:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C88E286B1 for ; Mon, 12 Nov 2018 05:45:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731323AbeKLPhM (ORCPT ); Mon, 12 Nov 2018 10:37:12 -0500 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:32674 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728269AbeKLPhM (ORCPT ); Mon, 12 Nov 2018 10:37:12 -0500 X-IronPort-AV: E=Sophos;i="5.54,494,1534834800"; d="scan'208";a="23150823" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 11 Nov 2018 22:45:32 -0700 Received: from NAM05-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.105) with Microsoft SMTP Server (TLS) id 14.3.352.0; Sun, 11 Nov 2018 22:45:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dQZKC8ZUyL/vDc/ay/TL8yJrY7ne1t3X9adhdGGFjbo=; b=FTQlrWRvU/Mi17w10wlu+ICXssK+5gpMflnxkYDxCHfZJUhlSbDle1Tz4fu1y2URaZl2aBJz85r9Q1sXgVhOmWgbTBWn9pFOC5xwxdjBI3Ij85hhUqfn0UHR9a74/bTBm4PyXqLvEd+TZT5hCHZUECXGD2+qAa2hn4/fhF4cpXA= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2599.namprd11.prod.outlook.com (52.135.227.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Mon, 12 Nov 2018 05:45:29 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::b548:a8e4:b647:5b7]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::b548:a8e4:b647:5b7%6]) with mapi id 15.20.1294.044; Mon, 12 Nov 2018 05:45:29 +0000 From: To: CC: , , , , Subject: [PATCH 10/12] staging: wilc1000: added 'WILC_' prefix for constants to have clear namespace Thread-Topic: [PATCH 10/12] staging: wilc1000: added 'WILC_' prefix for constants to have clear namespace Thread-Index: AQHUekrrgYivYpl2AEePhC1CU9LWRw== Date: Mon, 12 Nov 2018 05:45:29 +0000 Message-ID: <1542001458-20217-11-git-send-email-ajay.kathat@microchip.com> References: <1542001458-20217-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1542001458-20217-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0135.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::29) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [27.59.94.109] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2599;6:r9vEywJ9b/HIFgaUxI/QzuCK2B35RTJEEy4t5GaLD0K4y4+3a/soXU5hNkZGWaHuQMHS9ZDFecFRlxpQmx1tSptvxelj5M0wMeXs/43coAH5zoYpreiLl56Pm4oO2hJP6NbKuaWk5V+Jso50RZSaMy7YVHeTmaZN8CBj4/yO2sI5CWBNErpr3k/8XvLAcXmr37Ere4TpHMi3DG2SbjOslpF7qqLuTBL2hhVNkP9WuweZgCKJ42zkndBEOF0d3aUb0Has/iLDVTAkJhd4cqW5tdbyZL+Nb/194fN+5y3Cj8RwTMYqVeJufr8fnGaQCFuWBxcNqiz3N72U9Wbox0q6QCixHnna+jf/1Vu2GWZxBPe4/aUDTQeACfxWW2vuFf+7xVrY0LUKn5rTK22zn1uT+NvNxea63YYIL/SmoIRRSJDO5FHjxfW+Po/wo36bB/0wvKVEJhWLiHuuQ+U9QIajAg==;5:PQ9kjo64EI6Uu26kwQzzmO5dNm+Rwc3r2fCjC+AUIVQMuO6xFw8xZgtRlIoRdIkRWP47YoTy5rQkGu1Wtc+jmLLoeaJOWfd2V0IgO8HLqIdrOpJm1Xjrx2Pft8m9nmmJzbpomqRBOox+OiNQUWFHUMDusJ7/vfXvc6a32NXE4uw=;7:qki9b6j9A2SLQXlPrgw7f0FG+uUNbtG7jVygwJFggLAYZiQN/xEv6durL7V5i4umGSmvscokZ2P/2uFTkSstbB8TtWVn7O8qkMCP7mELfvDcBHFsoXIe2PEmxe/3bP2LeZHSpqhOnSwD1khTLGH8bQ== x-ms-office365-filtering-correlation-id: bc38a3e3-cd1a-4760-2b78-08d648620d88 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390040)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2599; x-ms-traffictypediagnostic: BYAPR11MB2599: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(21532816269658); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(3231402)(944501410)(52105112)(10201501046)(93006095)(93001095)(148016)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095);SRVR:BYAPR11MB2599;BCL:0;PCL:0;RULEID:;SRVR:BYAPR11MB2599; x-forefront-prvs: 0854128AF0 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(346002)(396003)(136003)(366004)(39860400002)(189003)(199004)(4326008)(25786009)(2906002)(6116002)(3846002)(72206003)(26005)(2351001)(14454004)(86362001)(575784001)(186003)(6436002)(478600001)(6486002)(105586002)(76176011)(106356001)(2501003)(107886003)(5640700003)(54906003)(52116002)(99286004)(102836004)(53936002)(14444005)(53946003)(256004)(6506007)(386003)(316002)(36756003)(486006)(8936002)(6916009)(11346002)(7736002)(305945005)(476003)(2616005)(68736007)(8676002)(71200400001)(97736004)(5660300001)(66066001)(446003)(81156014)(81166006)(6512007)(71190400001)(2900100001)(4744004)(579004)(569006);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2599;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: q6DVVvJXWHHEToKIzrXOkgyi7HGMEjGi/6S3llg/H+wd5Q1j9eOl1465x1Gs1FAhxqdFMe69sILjshBJpqNdvje++or6TezPKWBWaECmXorU/gw2rcuB0Gbiy62j500ICYIYs3AlF4bRhkdvJJad+wXO04aeuNSV/FTat9posqcQ1HarDSEse/Mwn010tCmtncuhX/VnawCn1P5gMuK4nz9FJr9zL0rLIwitZ8nsK+MtNPfI1VuOMxdiKB2UYyDMYPO6QWcxmQJamNUIJLNIx2hX/P5Edg8sJMVM0isWwHDSjOwwjI4P2yQt7xCMdNbN+ynA7vByUJNS50nkruRwCR8cFPgsP4/fHZ+d7sr0+HI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: bc38a3e3-cd1a-4760-2b78-08d648620d88 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Nov 2018 05:45:29.5400 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2599 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh For better namespace added 'WILC_' prefix for driver specific constants. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/host_interface.c | 162 +++++++++++----------- drivers/staging/wilc1000/host_interface.h | 59 ++++---- drivers/staging/wilc1000/linux_wlan.c | 20 +-- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 56 ++++---- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 8 +- drivers/staging/wilc1000/wilc_wlan.c | 4 +- 6 files changed, 159 insertions(+), 150 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index c238d39..5ab426c 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -94,7 +94,7 @@ struct set_multicast { }; struct del_all_sta { - u8 del_all_sta[MAX_NUM_STA][ETH_ALEN]; + u8 del_all_sta[WILC_MAX_NUM_STA][ETH_ALEN]; u8 assoc_sta; }; @@ -242,7 +242,7 @@ static struct wilc_vif *wilc_get_vif_from_idx(struct wilc *wilc, int idx) { int index = idx - 1; - if (index < 0 || index >= NUM_CONCURRENT_IFC) + if (index < 0 || index >= WILC_NUM_CONCURRENT_IFC) return NULL; return wilc->vif[index]; @@ -261,7 +261,7 @@ static void handle_set_channel(struct work_struct *work) wid.val = (char *)&hif_set_ch->set_ch; wid.size = sizeof(char); - ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (ret) @@ -284,7 +284,7 @@ static void handle_set_wfi_drv_handler(struct work_struct *work) hif_drv = vif->hif_drv; - buffer = kzalloc(DRV_HANDLER_SIZE, GFP_KERNEL); + buffer = kzalloc(WILC_DRV_HANDLER_SIZE, GFP_KERNEL); if (!buffer) goto free_msg; @@ -302,9 +302,9 @@ static void handle_set_wfi_drv_handler(struct work_struct *work) wid.id = WID_SET_DRV_HANDLER; wid.type = WID_STR; wid.val = (s8 *)buffer; - wid.size = DRV_HANDLER_SIZE; + wid.size = WILC_DRV_HANDLER_SIZE; - ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, hif_drv->driver_handler_id); if (ret) netdev_err(vif->ndev, "Failed to set driver handler\n"); @@ -331,7 +331,7 @@ static void handle_set_operation_mode(struct work_struct *work) wid.val = (s8 *)&hif_op_mode->mode; wid.size = sizeof(u32); - ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (ret) @@ -353,7 +353,7 @@ static void handle_get_mac_address(struct work_struct *work) wid.val = get_mac_addr->mac_addr; wid.size = ETH_ALEN; - ret = wilc_send_config_pkt(vif, GET_CFG, &wid, 1, + ret = wilc_send_config_pkt(vif, WILC_GET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (ret) @@ -371,28 +371,28 @@ static void handle_cfg_param(struct work_struct *work) struct wid wid_list[32]; int i = 0; - if (param->flag & RETRY_SHORT) { + if (param->flag & WILC_CFG_PARAM_RETRY_SHORT) { wid_list[i].id = WID_SHORT_RETRY_LIMIT; wid_list[i].val = (s8 *)¶m->short_retry_limit; wid_list[i].type = WID_SHORT; wid_list[i].size = sizeof(u16); i++; } - if (param->flag & RETRY_LONG) { + if (param->flag & WILC_CFG_PARAM_RETRY_LONG) { wid_list[i].id = WID_LONG_RETRY_LIMIT; wid_list[i].val = (s8 *)¶m->long_retry_limit; wid_list[i].type = WID_SHORT; wid_list[i].size = sizeof(u16); i++; } - if (param->flag & FRAG_THRESHOLD) { + if (param->flag & WILC_CFG_PARAM_FRAG_THRESHOLD) { wid_list[i].id = WID_FRAG_THRESHOLD; wid_list[i].val = (s8 *)¶m->frag_threshold; wid_list[i].type = WID_SHORT; wid_list[i].size = sizeof(u16); i++; } - if (param->flag & RTS_THRESHOLD) { + if (param->flag & WILC_CFG_PARAM_RTS_THRESHOLD) { wid_list[i].id = WID_RTS_THRESHOLD; wid_list[i].val = (s8 *)¶m->rts_threshold; wid_list[i].type = WID_SHORT; @@ -400,7 +400,7 @@ static void handle_cfg_param(struct work_struct *work) i++; } - ret = wilc_send_config_pkt(vif, SET_CFG, wid_list, + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, i, wilc_get_vif_idx(vif)); if (ret) @@ -424,7 +424,7 @@ static int handle_scan_done(struct wilc_vif *vif, enum scan_event evt) wid.val = (s8 *)&abort_running_scan; wid.size = sizeof(char); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) { @@ -538,7 +538,7 @@ static void handle_scan(struct work_struct *work) wid_list[index].val = (s8 *)&scan_info->src; index++; - result = wilc_send_config_pkt(vif, SET_CFG, wid_list, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, index, wilc_get_vif_idx(vif)); @@ -764,7 +764,7 @@ static void handle_connect(struct work_struct *work) cur_byte = wid_list[wid_cnt].val; wid_cnt++; - result = wilc_send_config_pkt(vif, SET_CFG, wid_list, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, wid_cnt, wilc_get_vif_idx(vif)); if (result) { @@ -873,7 +873,7 @@ static void handle_connect_timeout(struct work_struct *work) wid.val = (s8 *)&dummy_reason_code; wid.size = sizeof(char); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to send disconnect\n"); @@ -1234,7 +1234,7 @@ static void host_int_get_assoc_res_info(struct wilc_vif *vif, wid.val = assoc_resp_info; wid.size = max_assoc_resp_info_len; - result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_GET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) { *rcvd_assoc_resp_info_len = 0; @@ -1290,10 +1290,10 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif, if (mac_status == WILC_MAC_STATUS_CONNECTED) { u32 assoc_resp_info_len; - memset(hif_drv->assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE); + memset(hif_drv->assoc_resp, 0, WILC_MAX_ASSOC_RESP_FRAME_SIZE); host_int_get_assoc_res_info(vif, hif_drv->assoc_resp, - MAX_ASSOC_RESP_FRAME_SIZE, + WILC_MAX_ASSOC_RESP_FRAME_SIZE, &assoc_resp_info_len); if (assoc_resp_info_len != 0) { @@ -1469,7 +1469,7 @@ static int wilc_pmksa_key_copy(struct wilc_vif *vif, struct key_attr *hif_key) wid.val = (s8 *)key_buf; wid.size = (hif_key->attr.pmkid.numpmkid * PMKSA_KEY_LEN) + 1; - ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); kfree(key_buf); @@ -1489,9 +1489,9 @@ static void handle_key(struct work_struct *work) struct host_if_drv *hif_drv = vif->hif_drv; switch (hif_key->type) { - case WEP: + case WILC_KEY_TYPE_WEP: - if (hif_key->action & ADDKEY_AP) { + if (hif_key->action & WILC_ADD_KEY_AP) { wid_list[0].id = WID_11I_MODE; wid_list[0].type = WID_CHAR; wid_list[0].size = sizeof(char); @@ -1520,11 +1520,11 @@ static void handle_key(struct work_struct *work) wid_list[2].size = hif_key->attr.wep.key_len + 2; wid_list[2].val = (s8 *)key_buf; - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, 3, wilc_get_vif_idx(vif)); kfree(key_buf); - } else if (hif_key->action & ADDKEY) { + } else if (hif_key->action & WILC_ADD_KEY) { key_buf = kmalloc(hif_key->attr.wep.key_len + 2, GFP_KERNEL); if (!key_buf) { @@ -1541,27 +1541,27 @@ static void handle_key(struct work_struct *work) wid.val = (s8 *)key_buf; wid.size = hif_key->attr.wep.key_len + 2; - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); kfree(key_buf); - } else if (hif_key->action & REMOVEKEY) { + } else if (hif_key->action & WILC_REMOVE_KEY) { wid.id = WID_REMOVE_WEP_KEY; wid.type = WID_STR; wid.val = (s8 *)&hif_key->attr.wep.index; wid.size = 1; - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); - } else if (hif_key->action & DEFAULTKEY) { + } else if (hif_key->action & WILC_DEFAULT_KEY) { wid.id = WID_KEY_ID; wid.type = WID_CHAR; wid.val = (s8 *)&hif_key->attr.wep.index; wid.size = sizeof(char); - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); } @@ -1569,8 +1569,8 @@ static void handle_key(struct work_struct *work) complete(&msg->work_comp); break; - case WPA_RX_GTK: - if (hif_key->action & ADDKEY_AP) { + case WILC_KEY_TYPE_WPA_RX_GTK: + if (hif_key->action & WILC_ADD_KEY_AP) { key_buf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL); if (!key_buf) { result = -ENOMEM; @@ -1595,12 +1595,12 @@ static void handle_key(struct work_struct *work) wid_list[1].val = (s8 *)key_buf; wid_list[1].size = RX_MIC_KEY_MSG_LEN; - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, 2, wilc_get_vif_idx(vif)); kfree(key_buf); - } else if (hif_key->action & ADDKEY) { + } else if (hif_key->action & WILC_ADD_KEY) { key_buf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL); if (!key_buf) { result = -ENOMEM; @@ -1623,7 +1623,7 @@ static void handle_key(struct work_struct *work) wid.val = (s8 *)key_buf; wid.size = RX_MIC_KEY_MSG_LEN; - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); @@ -1633,8 +1633,8 @@ static void handle_key(struct work_struct *work) complete(&msg->work_comp); break; - case WPA_PTK: - if (hif_key->action & ADDKEY_AP) { + case WILC_KEY_TYPE_WPA_PTK: + if (hif_key->action & WILC_ADD_KEY_AP) { key_buf = kmalloc(PTK_KEY_MSG_LEN + 1, GFP_KERNEL); if (!key_buf) { result = -ENOMEM; @@ -1657,11 +1657,11 @@ static void handle_key(struct work_struct *work) wid_list[1].val = (s8 *)key_buf; wid_list[1].size = PTK_KEY_MSG_LEN + 1; - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, 2, wilc_get_vif_idx(vif)); kfree(key_buf); - } else if (hif_key->action & ADDKEY) { + } else if (hif_key->action & WILC_ADD_KEY) { key_buf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL); if (!key_buf) { result = -ENOMEM; @@ -1678,7 +1678,7 @@ static void handle_key(struct work_struct *work) wid.val = (s8 *)key_buf; wid.size = PTK_KEY_MSG_LEN; - result = wilc_send_config_pkt(vif, SET_CFG, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); kfree(key_buf); @@ -1688,7 +1688,7 @@ static void handle_key(struct work_struct *work) complete(&msg->work_comp); break; - case PMKSA: + case WILC_KEY_TYPE_PMKSA: result = wilc_pmksa_key_copy(vif, hif_key); /*free 'msg', this case it not a sync call*/ kfree(msg); @@ -1721,7 +1721,7 @@ static void handle_disconnect(struct work_struct *work) vif->obtaining_ip = false; wilc_set_power_mgmt(vif, 0, 0); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) { @@ -1794,7 +1794,7 @@ static void handle_get_rssi(struct work_struct *work) wid.val = msg->body.data; wid.size = sizeof(char); - result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_GET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to get RSSI value\n"); @@ -1841,7 +1841,7 @@ static void handle_get_statistics(struct work_struct *work) wid_list[wid_cnt].val = (s8 *)&stats->tx_fail_cnt; wid_cnt++; - result = wilc_send_config_pkt(vif, GET_CFG, wid_list, + result = wilc_send_config_pkt(vif, WILC_GET_CFG, wid_list, wid_cnt, wilc_get_vif_idx(vif)); @@ -1878,7 +1878,7 @@ static void handle_get_inactive_time(struct work_struct *work) ether_addr_copy(wid.val, hif_sta_inactive->mac); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); kfree(wid.val); @@ -1892,7 +1892,7 @@ static void handle_get_inactive_time(struct work_struct *work) wid.val = (s8 *)&hif_sta_inactive->inactive_time; wid.size = sizeof(u32); - result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_GET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) @@ -1947,7 +1947,7 @@ static void handle_add_beacon(struct work_struct *work) memcpy(cur_byte, param->tail, param->tail_len); cur_byte += param->tail_len; - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to send add beacon\n"); @@ -1972,7 +1972,7 @@ static void handle_del_beacon(struct work_struct *work) wid.size = sizeof(char); wid.val = &del_beacon; - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to send delete beacon\n"); @@ -2029,7 +2029,7 @@ static void handle_add_station(struct work_struct *work) cur_byte = wid.val; cur_byte += wilc_hif_pack_sta_param(cur_byte, param); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result != 0) netdev_err(vif->ndev, "Failed to send add station\n"); @@ -2063,7 +2063,7 @@ static void handle_del_all_sta(struct work_struct *work) *(curr_byte++) = param->assoc_sta; - for (i = 0; i < MAX_NUM_STA; i++) { + for (i = 0; i < WILC_MAX_NUM_STA; i++) { if (memcmp(param->del_all_sta[i], zero_buff, ETH_ALEN)) memcpy(curr_byte, param->del_all_sta[i], ETH_ALEN); else @@ -2072,7 +2072,7 @@ static void handle_del_all_sta(struct work_struct *work) curr_byte += ETH_ALEN; } - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to send delete all station\n"); @@ -2102,7 +2102,7 @@ static void handle_del_station(struct work_struct *work) ether_addr_copy(wid.val, param->mac_addr); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to del station\n"); @@ -2132,7 +2132,7 @@ static void handle_edit_station(struct work_struct *work) cur_byte = wid.val; cur_byte += wilc_hif_pack_sta_param(cur_byte, param); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to send edit station\n"); @@ -2189,7 +2189,7 @@ static int handle_remain_on_chan(struct wilc_vif *vif, wid.val[0] = remain_on_chan_flag; wid.val[1] = (s8)hif_remain_ch->ch; - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); kfree(wid.val); if (result != 0) @@ -2232,7 +2232,7 @@ static void handle_register_frame(struct work_struct *work) wid.size = sizeof(u16) + 2; - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); kfree(wid.val); if (result) @@ -2266,7 +2266,7 @@ static void handle_listen_state_expired(struct work_struct *work) wid.val[0] = remain_on_chan_flag; wid.val[1] = FALSE_FRMWR_CHANNEL; - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); kfree(wid.val); if (result != 0) { @@ -2328,7 +2328,7 @@ static void handle_power_management(struct work_struct *work) wid.val = &power_mode; wid.size = sizeof(char); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to send power management\n"); @@ -2366,7 +2366,7 @@ static void handle_set_mcast_filter(struct work_struct *work) memcpy(cur_byte, hif_set_mc->mc_list, ((hif_set_mc->cnt) * ETH_ALEN)); - result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (result) netdev_err(vif->ndev, "Failed to send setup multicast\n"); @@ -2390,7 +2390,7 @@ static void handle_set_tx_pwr(struct work_struct *work) wid.val = &tx_pwr; wid.size = sizeof(char); - ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, + ret = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (ret) netdev_err(vif->ndev, "Failed to set TX PWR\n"); @@ -2411,7 +2411,7 @@ static void handle_get_tx_pwr(struct work_struct *work) wid.val = (s8 *)tx_pwr; wid.size = sizeof(char); - ret = wilc_send_config_pkt(vif, GET_CFG, &wid, 1, + ret = wilc_send_config_pkt(vif, WILC_GET_CFG, &wid, 1, wilc_get_vif_idx(vif)); if (ret) netdev_err(vif->ndev, "Failed to get TX PWR\n"); @@ -2501,8 +2501,8 @@ int wilc_remove_wep_key(struct wilc_vif *vif, u8 index) if (IS_ERR(msg)) return PTR_ERR(msg); - msg->body.key_info.type = WEP; - msg->body.key_info.action = REMOVEKEY; + msg->body.key_info.type = WILC_KEY_TYPE_WEP; + msg->body.key_info.action = WILC_REMOVE_KEY; msg->body.key_info.attr.wep.index = index; result = wilc_enqueue_work(msg); @@ -2531,8 +2531,8 @@ int wilc_set_wep_default_keyid(struct wilc_vif *vif, u8 index) if (IS_ERR(msg)) return PTR_ERR(msg); - msg->body.key_info.type = WEP; - msg->body.key_info.action = DEFAULTKEY; + msg->body.key_info.type = WILC_KEY_TYPE_WEP; + msg->body.key_info.action = WILC_DEFAULT_KEY; msg->body.key_info.attr.wep.index = index; result = wilc_enqueue_work(msg); @@ -2561,8 +2561,8 @@ int wilc_add_wep_key_bss_sta(struct wilc_vif *vif, const u8 *key, u8 len, if (IS_ERR(msg)) return PTR_ERR(msg); - msg->body.key_info.type = WEP; - msg->body.key_info.action = ADDKEY; + msg->body.key_info.type = WILC_KEY_TYPE_WEP; + msg->body.key_info.action = WILC_ADD_KEY; msg->body.key_info.attr.wep.key = kmemdup(key, len, GFP_KERNEL); if (!msg->body.key_info.attr.wep.key) { result = -ENOMEM; @@ -2602,8 +2602,8 @@ int wilc_add_wep_key_bss_ap(struct wilc_vif *vif, const u8 *key, u8 len, if (IS_ERR(msg)) return PTR_ERR(msg); - msg->body.key_info.type = WEP; - msg->body.key_info.action = ADDKEY_AP; + msg->body.key_info.type = WILC_KEY_TYPE_WEP; + msg->body.key_info.action = WILC_ADD_KEY_AP; msg->body.key_info.attr.wep.key = kmemdup(key, len, GFP_KERNEL); if (!msg->body.key_info.attr.wep.key) { result = -ENOMEM; @@ -2653,13 +2653,13 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, if (IS_ERR(msg)) return PTR_ERR(msg); - msg->body.key_info.type = WPA_PTK; - if (mode == AP_MODE) { - msg->body.key_info.action = ADDKEY_AP; + msg->body.key_info.type = WILC_KEY_TYPE_WPA_PTK; + if (mode == WILC_AP_MODE) { + msg->body.key_info.action = WILC_ADD_KEY_AP; msg->body.key_info.attr.wpa.index = index; } - if (mode == STATION_MODE) - msg->body.key_info.action = ADDKEY; + if (mode == WILC_STATION_MODE) + msg->body.key_info.action = WILC_ADD_KEY; msg->body.key_info.attr.wpa.key = kmemdup(ptk, ptk_key_len, GFP_KERNEL); if (!msg->body.key_info.attr.wpa.key) { @@ -2730,14 +2730,14 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, } } - msg->body.key_info.type = WPA_RX_GTK; + msg->body.key_info.type = WILC_KEY_TYPE_WPA_RX_GTK; - if (mode == AP_MODE) { - msg->body.key_info.action = ADDKEY_AP; + if (mode == WILC_AP_MODE) { + msg->body.key_info.action = WILC_ADD_KEY_AP; msg->body.key_info.attr.wpa.mode = cipher_mode; } - if (mode == STATION_MODE) - msg->body.key_info.action = ADDKEY; + if (mode == WILC_STATION_MODE) + msg->body.key_info.action = WILC_ADD_KEY; msg->body.key_info.attr.wpa.key = kmemdup(rx_gtk, key_len, GFP_KERNEL); if (!msg->body.key_info.attr.wpa.key) { @@ -2787,8 +2787,8 @@ int wilc_set_pmkid_info(struct wilc_vif *vif, if (IS_ERR(msg)) return PTR_ERR(msg); - msg->body.key_info.type = PMKSA; - msg->body.key_info.action = ADDKEY; + msg->body.key_info.type = WILC_KEY_TYPE_PMKSA; + msg->body.key_info.action = WILC_ADD_KEY; for (i = 0; i < pmkid->numpmkid; i++) { memcpy(msg->body.key_info.attr.pmkid.pmkidlist[i].bssid, @@ -3640,7 +3640,7 @@ int wilc_del_allstation(struct wilc_vif *vif, u8 mac_addr[][ETH_ALEN]) del_all_sta_info = &msg->body.del_all_sta_info; - for (i = 0; i < MAX_NUM_STA; i++) { + for (i = 0; i < WILC_MAX_NUM_STA; i++) { if (memcmp(mac_addr[i], zero_addr, ETH_ALEN)) { memcpy(del_all_sta_info->del_all_sta[i], mac_addr[i], ETH_ALEN); diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 610ca2b..606e80a 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -9,20 +9,25 @@ #include #include "wilc_wlan_if.h" -#define IDLE_MODE 0x00 -#define AP_MODE 0x01 -#define STATION_MODE 0x02 -#define GO_MODE 0x03 -#define CLIENT_MODE 0x04 - -#define MAX_NUM_STA 9 -#define ADDKEY 0x1 -#define REMOVEKEY 0x2 -#define DEFAULTKEY 0x4 -#define ADDKEY_AP 0x8 +enum { + WILC_IDLE_MODE = 0x0, + WILC_AP_MODE = 0x1, + WILC_STATION_MODE = 0x2, + WILC_GO_MODE = 0x3, + WILC_CLIENT_MODE = 0x4 +}; + +enum { + WILC_ADD_KEY = 0x1, + WILC_REMOVE_KEY = 0x2, + WILC_DEFAULT_KEY = 0x4, + WILC_ADD_KEY_AP = 0x8 +}; + +#define WILC_MAX_NUM_STA 9 #define MAX_NUM_SCANNED_NETWORKS 100 #define MAX_NUM_SCANNED_NETWORKS_SHADOW 130 -#define MAX_NUM_PROBED_SSID 10 +#define WILC_MAX_NUM_PROBED_SSID 10 #define TX_MIC_KEY_LEN 8 #define RX_MIC_KEY_LEN 8 @@ -34,16 +39,18 @@ #define PMKSA_KEY_LEN 22 #define WILC_MAX_NUM_PMKIDS 16 #define WILC_ADD_STA_LENGTH 40 -#define NUM_CONCURRENT_IFC 2 -#define DRV_HANDLER_SIZE 5 +#define WILC_NUM_CONCURRENT_IFC 2 +#define WILC_DRV_HANDLER_SIZE 5 #define DRV_HANDLER_MASK 0x000000FF #define NUM_RSSI 5 -#define SET_CFG 0 -#define GET_CFG 1 +enum { + WILC_SET_CFG = 0, + WILC_GET_CFG +}; -#define MAX_ASSOC_RESP_FRAME_SIZE 256 +#define WILC_MAX_ASSOC_RESP_FRAME_SIZE 256 struct rssi_history_buffer { bool full; @@ -130,10 +137,10 @@ struct cfg_param_attr { }; enum cfg_param { - RETRY_SHORT = BIT(0), - RETRY_LONG = BIT(1), - FRAG_THRESHOLD = BIT(2), - RTS_THRESHOLD = BIT(3), + WILC_CFG_PARAM_RETRY_SHORT = BIT(0), + WILC_CFG_PARAM_RETRY_LONG = BIT(1), + WILC_CFG_PARAM_FRAG_THRESHOLD = BIT(2), + WILC_CFG_PARAM_RTS_THRESHOLD = BIT(3) }; struct found_net_info { @@ -155,10 +162,10 @@ enum conn_event { }; enum KEY_TYPE { - WEP, - WPA_RX_GTK, - WPA_PTK, - PMKSA, + WILC_KEY_TYPE_WEP, + WILC_KEY_TYPE_WPA_RX_GTK, + WILC_KEY_TYPE_WPA_PTK, + WILC_KEY_TYPE_PMKSA, }; typedef void (*wilc_scan_result)(enum scan_event, struct network_info *, @@ -268,7 +275,7 @@ struct host_if_drv { bool ifc_up; int driver_handler_id; - u8 assoc_resp[MAX_ASSOC_RESP_FRAME_SIZE]; + u8 assoc_resp[WILC_MAX_ASSOC_RESP_FRAME_SIZE]; }; struct add_sta_param { diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index faf97df..96d8834 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -46,7 +46,8 @@ static int dev_state_ev_handler(struct notifier_block *this, switch (event) { case NETDEV_UP: - if (vif->iftype == STATION_MODE || vif->iftype == CLIENT_MODE) { + if (vif->iftype == WILC_STATION_MODE || + vif->iftype == WILC_CLIENT_MODE) { hif_drv->ifc_up = 1; vif->obtaining_ip = false; del_timer(&vif->during_ip_timer); @@ -65,7 +66,8 @@ static int dev_state_ev_handler(struct notifier_block *this, break; case NETDEV_DOWN: - if (vif->iftype == STATION_MODE || vif->iftype == CLIENT_MODE) { + if (vif->iftype == WILC_STATION_MODE || + vif->iftype == WILC_CLIENT_MODE) { hif_drv->ifc_up = 0; vif->obtaining_ip = false; } @@ -179,11 +181,11 @@ static struct net_device *get_if_handler(struct wilc *wilc, u8 *mac_header) bssid1 = mac_header + 4; for (i = 0; i < wilc->vif_num; i++) { - if (wilc->vif[i]->mode == STATION_MODE) + if (wilc->vif[i]->mode == WILC_STATION_MODE) if (ether_addr_equal_unaligned(bssid, wilc->vif[i]->bssid)) return wilc->vif[i]->ndev; - if (wilc->vif[i]->mode == AP_MODE) + if (wilc->vif[i]->mode == WILC_AP_MODE) if (ether_addr_equal_unaligned(bssid1, wilc->vif[i]->bssid)) return wilc->vif[i]->ndev; @@ -1021,12 +1023,12 @@ void wilc_netdev_cleanup(struct wilc *wilc) } if (wilc->vif[0]->ndev || wilc->vif[1]->ndev) { - for (i = 0; i < NUM_CONCURRENT_IFC; i++) + for (i = 0; i < WILC_NUM_CONCURRENT_IFC; i++) if (wilc->vif[i]->ndev) if (wilc->vif[i]->mac_opened) wilc_mac_close(wilc->vif[i]->ndev); - for (i = 0; i < NUM_CONCURRENT_IFC; i++) { + for (i = 0; i < WILC_NUM_CONCURRENT_IFC; i++) { unregister_netdev(wilc->vif[i]->ndev); wilc_free_wiphy(wilc->vif[i]->ndev); free_netdev(wilc->vif[i]->ndev); @@ -1082,7 +1084,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, register_inetaddr_notifier(&g_dev_notifier); - for (i = 0; i < NUM_CONCURRENT_IFC; i++) { + for (i = 0; i < WILC_NUM_CONCURRENT_IFC; i++) { struct wireless_dev *wdev; ndev = alloc_etherdev(sizeof(struct wilc_vif)); @@ -1130,7 +1132,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, if (ret) goto free_ndev; - vif->iftype = STATION_MODE; + vif->iftype = WILC_STATION_MODE; vif->mac_opened = 0; } @@ -1139,7 +1141,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, free_ndev: for (; i >= 0; i--) { if (wl->vif[i]) { - if (wl->vif[i]->iftype == STATION_MODE) + if (wl->vif[i]->iftype == WILC_STATION_MODE) unregister_netdev(wl->vif[i]->ndev); if (wl->vif[i]->ndev) { diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 4cfa3ff4..9906a9f7 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -465,7 +465,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, conn_info->status == WLAN_STATUS_SUCCESS) { connect_status = WLAN_STATUS_UNSPECIFIED_FAILURE; wilc_wlan_set_bssid(priv->dev, null_bssid, - STATION_MODE); + WILC_STATION_MODE); if (!wfi_drv->p2p_connect) wlan_channel = INVALID_CHANNEL; @@ -507,7 +507,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, priv->p2p.recv_random = 0x00; priv->p2p.is_wilc_ie = false; eth_zero_addr(priv->associated_bss); - wilc_wlan_set_bssid(priv->dev, null_bssid, STATION_MODE); + wilc_wlan_set_bssid(priv->dev, null_bssid, WILC_STATION_MODE); if (!wfi_drv->p2p_connect) wlan_channel = INVALID_CHANNEL; @@ -768,7 +768,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, if (!wfi_drv->p2p_connect) wlan_channel = nw_info->ch; - wilc_wlan_set_bssid(dev, nw_info->bssid, STATION_MODE); + wilc_wlan_set_bssid(dev, nw_info->bssid, WILC_STATION_MODE); ret = wilc_set_join_req(vif, nw_info->bssid, sme->ssid, sme->ssid_len, sme->ie, sme->ie_len, @@ -781,7 +781,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, netdev_err(dev, "wilc_set_join_req(): Error\n"); ret = -ENOENT; - wilc_wlan_set_bssid(dev, null_bssid, STATION_MODE); + wilc_wlan_set_bssid(dev, null_bssid, WILC_STATION_MODE); goto out_error; } return 0; @@ -815,7 +815,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, wfi_drv = (struct host_if_drv *)priv->hif_drv; if (!wfi_drv->p2p_connect) wlan_channel = INVALID_CHANNEL; - wilc_wlan_set_bssid(priv->dev, null_bssid, STATION_MODE); + wilc_wlan_set_bssid(priv->dev, null_bssid, WILC_STATION_MODE); priv->p2p.local_random = 0x01; priv->p2p.recv_random = 0x00; @@ -961,7 +961,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, if (ret) return -ENOMEM; - op_mode = AP_MODE; + op_mode = WILC_AP_MODE; } else { if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) { @@ -970,7 +970,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, keylen = params->key_len - 16; } - op_mode = STATION_MODE; + op_mode = WILC_STATION_MODE; } if (!pairwise) @@ -1079,7 +1079,7 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev, u32 associatedsta = ~0; u32 inactive_time = 0; - if (vif->iftype == AP_MODE || vif->iftype == GO_MODE) { + if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) { for (i = 0; i < NUM_STA_ASSOCIATED; i++) { if (!(memcmp(mac, priv->assoc_stainfo.sta_associated_bss[i], @@ -1098,7 +1098,7 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev, wilc_get_inactive_time(vif, mac, &inactive_time); sinfo->inactive_time = 1000 * inactive_time; - } else if (vif->iftype == STATION_MODE) { + } else if (vif->iftype == WILC_STATION_MODE) { struct rf_info stats; wilc_get_statistics(vif, &stats, true); @@ -1143,14 +1143,14 @@ static int set_wiphy_params(struct wiphy *wiphy, u32 changed) netdev_dbg(vif->ndev, "Setting WIPHY_PARAM_RETRY_SHORT %d\n", wiphy->retry_short); - cfg_param_val.flag |= RETRY_SHORT; + cfg_param_val.flag |= WILC_CFG_PARAM_RETRY_SHORT; cfg_param_val.short_retry_limit = wiphy->retry_short; } if (changed & WIPHY_PARAM_RETRY_LONG) { netdev_dbg(vif->ndev, "Setting WIPHY_PARAM_RETRY_LONG %d\n", wiphy->retry_long); - cfg_param_val.flag |= RETRY_LONG; + cfg_param_val.flag |= WILC_CFG_PARAM_RETRY_LONG; cfg_param_val.long_retry_limit = wiphy->retry_long; } if (changed & WIPHY_PARAM_FRAG_THRESHOLD) { @@ -1159,7 +1159,7 @@ static int set_wiphy_params(struct wiphy *wiphy, u32 changed) netdev_dbg(vif->ndev, "Setting WIPHY_PARAM_FRAG_THRESHOLD %d\n", wiphy->frag_threshold); - cfg_param_val.flag |= FRAG_THRESHOLD; + cfg_param_val.flag |= WILC_CFG_PARAM_FRAG_THRESHOLD; cfg_param_val.frag_threshold = wiphy->frag_threshold; } else { netdev_err(vif->ndev, @@ -1173,7 +1173,7 @@ static int set_wiphy_params(struct wiphy *wiphy, u32 changed) netdev_dbg(vif->ndev, "Setting WIPHY_PARAM_RTS_THRESHOLD %d\n", wiphy->rts_threshold); - cfg_param_val.flag |= RTS_THRESHOLD; + cfg_param_val.flag |= WILC_CFG_PARAM_RTS_THRESHOLD; cfg_param_val.rts_threshold = wiphy->rts_threshold; } else { netdev_err(vif->ndev, "RTS threshold out of range\n"); @@ -1768,11 +1768,11 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, dev->ieee80211_ptr->iftype = type; priv->wdev->iftype = type; vif->monitor_flag = 0; - vif->iftype = STATION_MODE; - wilc_set_operation_mode(vif, STATION_MODE); + vif->iftype = WILC_STATION_MODE; + wilc_set_operation_mode(vif, WILC_STATION_MODE); memset(priv->assoc_stainfo.sta_associated_bss, 0, - MAX_NUM_STA * ETH_ALEN); + WILC_MAX_NUM_STA * ETH_ALEN); wl->enable_ps = true; wilc_set_power_mgmt(vif, 1, 0); @@ -1783,8 +1783,8 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, dev->ieee80211_ptr->iftype = type; priv->wdev->iftype = type; vif->monitor_flag = 0; - vif->iftype = CLIENT_MODE; - wilc_set_operation_mode(vif, STATION_MODE); + vif->iftype = WILC_CLIENT_MODE; + wilc_set_operation_mode(vif, WILC_STATION_MODE); wl->enable_ps = false; wilc_set_power_mgmt(vif, 0, 0); @@ -1794,12 +1794,12 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, wl->enable_ps = false; dev->ieee80211_ptr->iftype = type; priv->wdev->iftype = type; - vif->iftype = AP_MODE; + vif->iftype = WILC_AP_MODE; if (wl->initialized) { wilc_set_wfi_drv_handler(vif, wilc_get_vif_idx(vif), 0, vif->ifc_id, false); - wilc_set_operation_mode(vif, AP_MODE); + wilc_set_operation_mode(vif, WILC_AP_MODE); wilc_set_power_mgmt(vif, 0, 0); } break; @@ -1808,10 +1808,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, vif->obtaining_ip = true; mod_timer(&vif->during_ip_timer, jiffies + msecs_to_jiffies(DURING_IP_TIME_OUT)); - wilc_set_operation_mode(vif, AP_MODE); + wilc_set_operation_mode(vif, WILC_AP_MODE); dev->ieee80211_ptr->iftype = type; priv->wdev->iftype = type; - vif->iftype = GO_MODE; + vif->iftype = WILC_GO_MODE; wl->enable_ps = false; wilc_set_power_mgmt(vif, 0, 0); @@ -1838,7 +1838,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, if (ret != 0) netdev_err(dev, "Error in setting channel\n"); - wilc_wlan_set_bssid(dev, wl->vif[vif->idx]->src_addr, AP_MODE); + wilc_wlan_set_bssid(dev, wl->vif[vif->idx]->src_addr, WILC_AP_MODE); wilc_set_power_mgmt(vif, 0, 0); return wilc_add_beacon(vif, settings->beacon_interval, @@ -1865,7 +1865,7 @@ static int stop_ap(struct wiphy *wiphy, struct net_device *dev) struct wilc_vif *vif = netdev_priv(priv->dev); u8 null_bssid[ETH_ALEN] = {0}; - wilc_wlan_set_bssid(dev, null_bssid, AP_MODE); + wilc_wlan_set_bssid(dev, null_bssid, WILC_AP_MODE); ret = wilc_del_beacon(vif); @@ -1883,7 +1883,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, struct add_sta_param sta_params = { {0} }; struct wilc_vif *vif = netdev_priv(dev); - if (vif->iftype == AP_MODE || vif->iftype == GO_MODE) { + if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) { memcpy(sta_params.bssid, mac, ETH_ALEN); memcpy(priv->assoc_stainfo.sta_associated_bss[params->aid], mac, ETH_ALEN); @@ -1918,7 +1918,7 @@ static int del_station(struct wiphy *wiphy, struct net_device *dev, struct wilc_vif *vif = netdev_priv(dev); struct sta_info *info; - if (!(vif->iftype == AP_MODE || vif->iftype == GO_MODE)) + if (!(vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE)) return ret; info = &priv->assoc_stainfo; @@ -1939,7 +1939,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, struct add_sta_param sta_params = { {0} }; struct wilc_vif *vif = netdev_priv(dev); - if (vif->iftype == AP_MODE || vif->iftype == GO_MODE) { + if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) { memcpy(sta_params.bssid, mac, ETH_ALEN); sta_params.aid = params->aid; sta_params.rates_len = params->supported_rates_len; @@ -2141,7 +2141,7 @@ struct wireless_dev *wilc_create_wiphy(struct net_device *net, priv = wdev_priv(wdev); priv->wdev = wdev; - wdev->wiphy->max_scan_ssids = MAX_NUM_PROBED_SSID; + wdev->wiphy->max_scan_ssids = WILC_MAX_NUM_PROBED_SSID; #ifdef CONFIG_PM wdev->wiphy->wowlan = &wowlan_support; #endif diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 6283d9e..c6dad12 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -57,7 +57,7 @@ struct wilc_wfi_wep_key { }; struct sta_info { - u8 sta_associated_bss[MAX_NUM_STA][ETH_ALEN]; + u8 sta_associated_bss[WILC_MAX_NUM_STA][ETH_ALEN]; }; /*Parameters needed for host interface for remaining on channel*/ @@ -94,8 +94,8 @@ struct wilc_priv { u8 wep_key_len[4]; /* The real interface that the monitor is on */ struct net_device *real_ndev; - struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA]; - struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA]; + struct wilc_wfi_key *wilc_gtk[WILC_MAX_NUM_STA]; + struct wilc_wfi_key *wilc_ptk[WILC_MAX_NUM_STA]; u8 wilc_groupkey; /* mutexes */ struct mutex scan_req_lock; @@ -168,7 +168,7 @@ struct wilc { int dev_irq_num; int close; u8 vif_num; - struct wilc_vif *vif[NUM_CONCURRENT_IFC]; + struct wilc_vif *vif[WILC_NUM_CONCURRENT_IFC]; u8 open_ifcs; /*protect head of transmit queue*/ struct mutex txq_add_to_head_cs; diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index d474b87..563ce62 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1205,7 +1205,7 @@ int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids, int i; int ret = 0; - if (mode == GET_CFG) { + if (mode == WILC_GET_CFG) { for (i = 0; i < count; i++) { if (!wilc_wlan_cfg_get(vif, !i, wids[i].id, @@ -1221,7 +1221,7 @@ int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids, wids[i].val, wids[i].size); } - } else if (mode == SET_CFG) { + } else if (mode == WILC_SET_CFG) { for (i = 0; i < count; i++) { if (!wilc_wlan_cfg_set(vif, !i, wids[i].id,