From patchwork Thu Jan 13 08:55:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 12712461 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87A0EC433FE for ; Thu, 13 Jan 2022 08:56:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232362AbiAMI4s (ORCPT ); Thu, 13 Jan 2022 03:56:48 -0500 Received: from mail-dm6nam11on2085.outbound.protection.outlook.com ([40.107.223.85]:34208 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232119AbiAMI4a (ORCPT ); Thu, 13 Jan 2022 03:56:30 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XV3M+ql9PCYNDsC6amPKPKPObAntNNYkg4HZ4OAvaf+QoT72Q0/IzM1hfrv0EbqeLi/VE7zAu7jXy+jf7TabOrUz+Cu6IB9/9iKhvebJBvcspRgB2/3Lb2BjUobleUrV1JArgvoQVS61aBSBT/0qQadxA1ZrssHTvXyUfI5Q8qJbN24pgBkVBevaggohipYQyfMKa+Z1IGpH3Ll/fwcBwwk8xM/uVaqRCdmhHuV4L+e5+l3lM03LcuXlAHjzhBbaZWWLbjuKeMp+IftyJ5ZLvkzj4h2MRHEuaOtHADSudKRKdyNVGK3OmYK1dQxLeqXL8So8yYUDl4zytAfpch6kBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PJFGAXUSKQ6VnacN19l4jg/RG2DR7GhGcU0SNdtk25o=; b=BHgCsD+7Cpnp1im+IHbJQ4rYNl81zJQGEA6RC+5WhiODM79xgI/eBTKF4slZt8n5bfneIpXKjPac/6jHLsTD0FfZQ2LE5R64Og9tWZdCE/JR9qSClBroJk0tFed+aqJrjtGV0wpvN7vPEmUrt6lb5F8p8s/4GFvhDnwoGj2P9/lW6simgtvC02902xVgRrVkK+f23uHXOg6tpQP+1NFqcsMPQ2nYmhQOA+fHKwbtlNZllWy+XFfXQaHekuxiJAcYvr+GK6rzV7YWKlAvY+K7JFPrzoHG3WOaE522o/vcl7ZhSnN7IWg0TOUFIrNwOd5PnkLxrxwx4eL1CdGKNh0aEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PJFGAXUSKQ6VnacN19l4jg/RG2DR7GhGcU0SNdtk25o=; b=nfEdVW7B9W9jf/1pDEbTtHAr05MCO5R32YCxAzSYQe0toLSzHnfRkEGz0yHBTVt7pfQDJwVKR4ou/wIezyF5+PNjbywRmsBJ9ixReAdhGWdx0MVvN2Y2zL5UjT0TYAhK5T7350vwP8q8aIopVJrnuhMmMbOvv6IeLrTMI9hPlmY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=silabs.com; Received: from PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) by CY4PR1101MB2071.namprd11.prod.outlook.com (2603:10b6:910:1a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 13 Jan 2022 08:56:13 +0000 Received: from PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4]) by PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4%5]) with mapi id 15.20.4888.011; Thu, 13 Jan 2022 08:56:13 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 18/31] staging: wfx: prefix structs hif_* with wfx_ Date: Thu, 13 Jan 2022 09:55:11 +0100 Message-Id: <20220113085524.1110708-19-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> References: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: SA0PR11CA0117.namprd11.prod.outlook.com (2603:10b6:806:d1::32) To PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 349a081d-3224-4eae-d0ad-08d9d6728d19 X-MS-TrafficTypeDiagnostic: CY4PR1101MB2071:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:113; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0odCqEvn2vZrAnstHWDBlsIrfm/87RCakxSq6uDzXFvAmED5dbUSQc0iGoZILplbMzzJh+InUJNUtFA8OOBS9hXdFY/ne8bCfdGS2tB1okNZMY1iuCBz/k8SjUACfjsnVR4riegPWzuiAWIROoDqzIlVIDgc8CeZ9MMdgQ/ZmhtZpGlodZX0EdeRK5jSEc+0H51oserG+mLHW2kpyCTQxJRld8JG6hR/RKkpsXAKrU7Rydnhtok8u4OCQ4Rm4WR7+dwjNQu5Elqp51xRUVmgAt0WMS7oRKIyvF9KNqM0yfeE4MEbr7aM+mRSiBaulpVZPEN8jW6wevCpcKa6w+uBVYK1s+cIEXAqTmkjKpbNATEHo0a/6Z/dcwjorfRVaDYY9CDpYBvP/AaM7l9uqLiCMhW0Ju+Wx7GVr6o92U0AgsVW5X0C5u451avU/wt+2KM7DZQdKnQVrgx9qaaSs/CEUtty2IZ3u66JqtYPBSsSgVtYbnoU14sIwzT3rFy0mO0M8qZcdAirXP0BrG8EXsFK98vUM6u+qrg/xB8HsjFgxV0m4qy3v9F9wq0p52icMpPeYyHbP0i4SoRvwLEeEsJ2ja+EPXdZZSzGSmbmo2iMChe+yHQ5uGIJlb3/KYvjZqfAD1Rkk5QNwiVrR8S+wPh1kA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB5657.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2616005)(66476007)(52116002)(8676002)(6486002)(4326008)(66574015)(38100700002)(8936002)(83380400001)(6506007)(107886003)(66556008)(36756003)(508600001)(2906002)(30864003)(5660300002)(6512007)(1076003)(86362001)(186003)(316002)(66946007)(54906003)(559001)(579004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?XGEQ6VrYQaWZ7gG5/dmR1w0J5uFq?= =?utf-8?q?WqH/vzc+5jdPO9JgiQvJtyO6T40cYPJyL3kFGybLOTNktnIhty8f3w/Y45cHq0h2m?= =?utf-8?q?vhmB6LvmtsFp+/ykFlwyxodEvcAWJbGqa+2+8buEH0PGpoBwz13vsJh5Lau4Ti0Q3?= =?utf-8?q?genoWbQP6nAKKYrWBtLk/A269XTFU89IWIjRvMa0Wwksp0RoZD9OQVecoskDVDSXV?= =?utf-8?q?S07Rd6CmmB1jDhiEWJ4jVncqbhkftEpX5VkQP0PGkzPqZHNtL5TDVcruUPYm64lii?= =?utf-8?q?IoeSW6ptU/TsMR3HldSoU1uqTI+9A+Gs5lUDFQKkcHZ+b0FgW6dBOXcpPPxMFQIW5?= =?utf-8?q?QEuXlGDpuRJUNmPUthUQJjMGpcqzrMrmFLL4CFfvhqB9N5REroG2ai8wDZUo6eVIr?= =?utf-8?q?K+IH16Ve7uA2BYrphIxiHudATVBLEZmfwcCx5GVDuZctZeoAtdUW7R85Z5QL90JSM?= =?utf-8?q?/RZt+2JjwfW73PbO2+If4OJ0Y/ygS+GY63SzAMlxkTwzLEkEpdAmH+GJOb08TpOBC?= =?utf-8?q?kZBZ2aWaUVXyfqFIXqNPduRV2fWDNAc7dSSdhMPRBlsD02Z0Y0vxEE3wmuB9kbGp6?= =?utf-8?q?A3yq94BZT1l2y4yppI/1mOJkTvndIY2Pu8LgRtb41SJYjLzxaBiC8Wam9NwW2BRlT?= =?utf-8?q?eZVIA2G5hjy5raAzBz0ezwAl121O86UMgDFiJGTuB+FpPdNvaUWdcA0wlucKPCV5+?= =?utf-8?q?Uc5MFhum8G6FbcYaN1J9lkyc0RtxLQoL5kJJBtfYjRZq0j/q/YW6ldzA4RSp5Mz/W?= =?utf-8?q?gUw+surMOW9Uc6is/C8TC83pCCMs+zHoUm8hlmKB3nDqAs5hrrko462Me0hMxiHFi?= =?utf-8?q?PsnJ8Yh5bo5pHW214ud3rbNoPk6uApARY+Zg1r9RtTB7yeB2Wm2UgjIs/FsK+bTou?= =?utf-8?q?Q2GEHb2IlvWqyTVsB/FVafieTDH7zj+lfhyqLhogUDCv4zrJ2FpuFLXaWVJZeYSZU?= =?utf-8?q?m+C3jxPb3zuhc9oe9mZcWwkxMT5awnwVWBl5Vo1OD50g2kWChuHsh4+MwMpAFmcdl?= =?utf-8?q?5gJPia/NL6Imo65XdOZ0mATnz1S93D5ciwhc2Y/y5e9ELqdKUOmSiIBlQw/+b5Ijj?= =?utf-8?q?MVjJwsByV+5xj93PSxgdAfcgI1MihcO8JbRUS//xkzmGy2buuuRCW34eNI2dGq/nu?= =?utf-8?q?N+Ti2FsMj2/n++AOttTS0QK9ucVWDd1LMR1wfZupUkNpgP2Ws7oq69hAb7eyQlbW+?= =?utf-8?q?JCiZBTNZQP3rIjHoNkB7sTVvzcnFfl9Ew/xCHnSJI4BRoffySG1SyNe4vwcGl6gD9?= =?utf-8?q?51k2ojCY0AzjPMVO3x7uynYYlMKkactYstPt8QFxUhjMUIa++BR3GJjD4eNJKYgWQ?= =?utf-8?q?ReekNJ+xPdwz8wvVUusbuBt+2QAGJEmRgbNVIhV+MZhMj8JUfH+WmWBwCPneYnVh4?= =?utf-8?q?dxCkdDeXCYOwgcL9DiZ3yqssbzcrHwWs+OU6Qg0JZfNzRzxfLLHcmolTFJzlA5OFI?= =?utf-8?q?Fkxmcm69s6h029zZn9B3n+D6JpGO4iHrkkrHl2UkJ0SvPRBsWXaW+CUAGhmTmKsfE?= =?utf-8?q?uslTW8SfDEZIKQ/LXym8nH4wohjKXVnWC50XE1sD5CPVbvaVyZ+Ic9iztBpEtMP1a?= =?utf-8?q?+d3qlgFAJmMrwxfVg2WROQ11GEE/TN7LuoOJMZnkr93yLZzVLw+azQ=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 349a081d-3224-4eae-d0ad-08d9d6728d19 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5657.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 08:56:13.6217 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j/02OVKS77tCg9E/vCPEPFVBmxqQG86LzfVm0obf3pJX+SBUthX3LOAsdNYg068fSuPx4m+1nNab5GrWvJ+gJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2071 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller All the types related to a driver should use the same prefix. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bh.c | 12 +-- drivers/staging/wfx/data_rx.c | 2 +- drivers/staging/wfx/data_rx.h | 4 +- drivers/staging/wfx/data_tx.c | 30 +++--- drivers/staging/wfx/data_tx.h | 8 +- drivers/staging/wfx/debug.c | 10 +- drivers/staging/wfx/hif_api_cmd.h | 142 +++++++++++++------------- drivers/staging/wfx/hif_api_general.h | 44 ++++---- drivers/staging/wfx/hif_api_mib.h | 66 ++++++------ drivers/staging/wfx/hif_rx.c | 57 ++++++----- drivers/staging/wfx/hif_tx.c | 95 ++++++++--------- drivers/staging/wfx/hif_tx.h | 20 ++-- drivers/staging/wfx/hif_tx_mib.c | 54 +++++----- drivers/staging/wfx/hif_tx_mib.h | 10 +- drivers/staging/wfx/key.c | 20 ++-- drivers/staging/wfx/main.c | 4 +- drivers/staging/wfx/queue.c | 22 ++-- drivers/staging/wfx/queue.h | 2 +- drivers/staging/wfx/sta.c | 2 +- drivers/staging/wfx/traces.h | 10 +- drivers/staging/wfx/wfx.h | 6 +- 21 files changed, 311 insertions(+), 309 deletions(-) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index b7fa0aeafd78..872f3298dc87 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -67,7 +67,7 @@ static void device_release(struct wfx_dev *wdev) static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) { struct sk_buff *skb; - struct hif_msg *hif; + struct wfx_hif_msg *hif; size_t alloc_len; size_t computed_len; int release_count; @@ -88,9 +88,9 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) piggyback = le16_to_cpup((__le16 *)(skb->data + alloc_len - 2)); _trace_piggyback(piggyback, false); - hif = (struct hif_msg *)skb->data; + hif = (struct wfx_hif_msg *)skb->data; WARN(hif->encrypted & 0x3, "encryption is unsupported"); - if (WARN(read_len < sizeof(struct hif_msg), "corrupted read")) + if (WARN(read_len < sizeof(struct wfx_hif_msg), "corrupted read")) goto err; computed_len = le16_to_cpu(hif->len); computed_len = round_up(computed_len, 2); @@ -105,7 +105,7 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) if (!(hif->id & HIF_ID_IS_INDICATION)) { (*is_cnf)++; if (hif->id == HIF_CNF_ID_MULTI_TRANSMIT) - release_count = ((struct hif_cnf_multi_transmit *)hif->body)->num_tx_confs; + release_count = ((struct wfx_hif_cnf_multi_transmit *)hif->body)->num_tx_confs; else release_count = 1; WARN(wdev->hif.tx_buffers_used < release_count, "corrupted buffer counter"); @@ -169,7 +169,7 @@ static int bh_work_rx(struct wfx_dev *wdev, int max_msg, int *num_cnf) return i; } -static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif) +static void tx_helper(struct wfx_dev *wdev, struct wfx_hif_msg *hif) { int ret; void *data; @@ -199,7 +199,7 @@ static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif) static int bh_work_tx(struct wfx_dev *wdev, int max_msg) { - struct hif_msg *hif; + struct wfx_hif_msg *hif; int i; for (i = 0; i < max_msg; i++) { diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c index bfc3961b7b89..3fe67c4815e7 100644 --- a/drivers/staging/wfx/data_rx.c +++ b/drivers/staging/wfx/data_rx.c @@ -35,7 +35,7 @@ static void wfx_rx_handle_ba(struct wfx_vif *wvif, struct ieee80211_mgmt *mgmt) } void wfx_rx_cb(struct wfx_vif *wvif, - const struct hif_ind_rx *arg, struct sk_buff *skb) + const struct wfx_hif_ind_rx *arg, struct sk_buff *skb) { struct ieee80211_rx_status *hdr = IEEE80211_SKB_RXCB(skb); struct ieee80211_hdr *frame = (struct ieee80211_hdr *)skb->data; diff --git a/drivers/staging/wfx/data_rx.h b/drivers/staging/wfx/data_rx.h index 84d0e3c0507b..7d77cdbbc31b 100644 --- a/drivers/staging/wfx/data_rx.h +++ b/drivers/staging/wfx/data_rx.h @@ -10,9 +10,9 @@ struct wfx_vif; struct sk_buff; -struct hif_ind_rx; +struct wfx_hif_ind_rx; void wfx_rx_cb(struct wfx_vif *wvif, - const struct hif_ind_rx *arg, struct sk_buff *skb); + const struct wfx_hif_ind_rx *arg, struct sk_buff *skb); #endif diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index c3efbcdcc8c3..c004f455bb47 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -329,16 +329,16 @@ static int wfx_tx_get_icv_len(struct ieee80211_key_conf *hw_key) static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, struct sk_buff *skb) { - struct hif_msg *hif_msg; - struct hif_req_tx *req; + struct wfx_hif_msg *hif_msg; + struct wfx_hif_req_tx *req; struct wfx_tx_priv *tx_priv; struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); struct ieee80211_key_conf *hw_key = tx_info->control.hw_key; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; int queue_id = skb_get_queue_mapping(skb); size_t offset = (size_t)skb->data & 3; - int wmsg_len = sizeof(struct hif_msg) + - sizeof(struct hif_req_tx) + offset; + int wmsg_len = sizeof(struct wfx_hif_msg) + + sizeof(struct wfx_hif_req_tx) + offset; WARN(queue_id >= IEEE80211_NUM_ACS, "unsupported queue_id"); wfx_tx_fixup_rates(tx_info->driver_rates); @@ -355,7 +355,7 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, skb_put(skb, tx_priv->icv_size); skb_push(skb, wmsg_len); memset(skb->data, 0, wmsg_len); - hif_msg = (struct hif_msg *)skb->data; + hif_msg = (struct wfx_hif_msg *)skb->data; hif_msg->len = cpu_to_le16(skb->len); hif_msg->id = HIF_REQ_ID_TX; hif_msg->interface = wvif->id; @@ -368,7 +368,7 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, } /* Fill tx request */ - req = (struct hif_req_tx *)hif_msg->body; + req = (struct wfx_hif_req_tx *)hif_msg->body; /* packet_id just need to be unique on device. 32bits are more than * necessary for that task, so we tae advantage of it to add some extra * data for debug. @@ -435,10 +435,10 @@ void wfx_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, static void wfx_skb_dtor(struct wfx_vif *wvif, struct sk_buff *skb) { - struct hif_msg *hif = (struct hif_msg *)skb->data; - struct hif_req_tx *req = (struct hif_req_tx *)hif->body; - unsigned int offset = sizeof(struct hif_msg) + - sizeof(struct hif_req_tx) + + struct wfx_hif_msg *hif = (struct hif_msg *)skb->data; + struct wfx_hif_req_tx *req = (struct hif_req_tx *)hif->body; + unsigned int offset = sizeof(struct wfx_hif_msg) + + sizeof(struct wfx_hif_req_tx) + req->fc_offset; if (!wvif) { @@ -452,7 +452,7 @@ static void wfx_skb_dtor(struct wfx_vif *wvif, struct sk_buff *skb) static void wfx_tx_fill_rates(struct wfx_dev *wdev, struct ieee80211_tx_info *tx_info, - const struct hif_cnf_tx *arg) + const struct wfx_hif_cnf_tx *arg) { struct ieee80211_tx_rate *rate; int tx_count; @@ -488,7 +488,7 @@ static void wfx_tx_fill_rates(struct wfx_dev *wdev, dev_dbg(wdev->dev, "%d more retries than expected\n", tx_count); } -void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct hif_cnf_tx *arg) +void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct wfx_hif_cnf_tx *arg) { const struct wfx_tx_priv *tx_priv; struct ieee80211_tx_info *tx_info; @@ -503,7 +503,7 @@ void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct hif_cnf_tx *arg) } tx_info = IEEE80211_SKB_CB(skb); tx_priv = wfx_skb_tx_priv(skb); - wvif = wdev_to_wvif(wdev, ((struct hif_msg *)skb->data)->interface); + wvif = wdev_to_wvif(wdev, ((struct wfx_hif_msg *)skb->data)->interface); WARN_ON(!wvif); if (!wvif) return; @@ -572,7 +572,7 @@ void wfx_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct wfx_dev *wdev = hw->priv; struct sk_buff_head dropped; struct wfx_vif *wvif; - struct hif_msg *hif; + struct wfx_hif_msg *hif; struct sk_buff *skb; skb_queue_head_init(&dropped); @@ -588,7 +588,7 @@ void wfx_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, if (wdev->chip_frozen) wfx_pending_drop(wdev, &dropped); while ((skb = skb_dequeue(&dropped)) != NULL) { - hif = (struct hif_msg *)skb->data; + hif = (struct wfx_hif_msg *)skb->data; wvif = wdev_to_wvif(wdev, hif->interface); ieee80211_tx_info_clear_status(IEEE80211_SKB_CB(skb)); wfx_skb_dtor(wvif, skb); diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h index 15590a8faefe..c901a03ee4d8 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/staging/wfx/data_tx.h @@ -43,7 +43,7 @@ void wfx_tx_policy_upload_work(struct work_struct *work); void wfx_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, struct sk_buff *skb); -void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct hif_cnf_tx *arg); +void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct wfx_hif_cnf_tx *arg); void wfx_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u32 queues, bool drop); @@ -57,10 +57,10 @@ static inline struct wfx_tx_priv *wfx_skb_tx_priv(struct sk_buff *skb) return (struct wfx_tx_priv *)tx_info->rate_driver_data; } -static inline struct hif_req_tx *wfx_skb_txreq(struct sk_buff *skb) +static inline struct wfx_hif_req_tx *wfx_skb_txreq(struct sk_buff *skb) { - struct hif_msg *hif = (struct hif_msg *)skb->data; - struct hif_req_tx *req = (struct hif_req_tx *)hif->body; + struct wfx_hif_msg *hif = (struct hif_msg *)skb->data; + struct wfx_hif_req_tx *req = (struct hif_req_tx *)hif->body; return req; } diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index 9324248b1d20..f0796eb2afff 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -63,7 +63,7 @@ static int wfx_counters_show(struct seq_file *seq, void *v) { int ret, i; struct wfx_dev *wdev = seq->private; - struct hif_mib_extended_count_table counters[3]; + struct wfx_hif_mib_extended_count_table counters[3]; for (i = 0; i < ARRAY_SIZE(counters); i++) { ret = wfx_hif_get_counters_table(wdev, i, counters + i); @@ -153,7 +153,7 @@ static const char * const channel_names[] = { static int wfx_rx_stats_show(struct seq_file *seq, void *v) { struct wfx_dev *wdev = seq->private; - struct hif_rx_stats *st = &wdev->rx_stats; + struct wfx_hif_rx_stats *st = &wdev->rx_stats; int i; mutex_lock(&wdev->rx_stats_lock); @@ -185,7 +185,7 @@ DEFINE_SHOW_ATTRIBUTE(wfx_rx_stats); static int wfx_tx_power_loop_show(struct seq_file *seq, void *v) { struct wfx_dev *wdev = seq->private; - struct hif_tx_power_loop_info *st = &wdev->tx_power_loop_info; + struct wfx_hif_tx_power_loop_info *st = &wdev->tx_power_loop_info; int tmp; mutex_lock(&wdev->tx_power_loop_info_lock); @@ -247,13 +247,13 @@ static ssize_t wfx_send_hif_msg_write(struct file *file, { struct dbgfs_hif_msg *context = file->private_data; struct wfx_dev *wdev = context->wdev; - struct hif_msg *request; + struct wfx_hif_msg *request; if (completion_done(&context->complete)) { dev_dbg(wdev->dev, "read previous result before start a new one\n"); return -EBUSY; } - if (count < sizeof(struct hif_msg)) + if (count < sizeof(struct wfx_hif_msg)) return -EINVAL; /* wfx_cmd_send() checks that reply buffer is wide enough, but does not diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h index b1829d01a5d9..463532b25939 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/staging/wfx/hif_api_cmd.h @@ -12,7 +12,7 @@ #include "hif_api_general.h" -enum hif_requests_ids { +enum wfx_hif_requests_ids { HIF_REQ_ID_RESET = 0x0a, HIF_REQ_ID_READ_MIB = 0x05, HIF_REQ_ID_WRITE_MIB = 0x06, @@ -31,7 +31,7 @@ enum hif_requests_ids { HIF_REQ_ID_MAP_LINK = 0x1c, }; -enum hif_confirmations_ids { +enum wfx_hif_confirmations_ids { HIF_CNF_ID_RESET = 0x0a, HIF_CNF_ID_READ_MIB = 0x05, HIF_CNF_ID_WRITE_MIB = 0x06, @@ -51,7 +51,7 @@ enum hif_confirmations_ids { HIF_CNF_ID_MAP_LINK = 0x1c, }; -enum hif_indications_ids { +enum wfx_hif_indications_ids { HIF_IND_ID_RX = 0x84, HIF_IND_ID_SCAN_CMPL = 0x86, HIF_IND_ID_JOIN_COMPLETE = 0x8f, @@ -60,40 +60,40 @@ enum hif_indications_ids { HIF_IND_ID_EVENT = 0x85 }; -struct hif_req_reset { +struct wfx_hif_req_reset { u8 reset_stat:1; u8 reset_all_int:1; u8 reserved1:6; u8 reserved2[3]; } __packed; -struct hif_cnf_reset { +struct wfx_hif_cnf_reset { __le32 status; } __packed; -struct hif_req_read_mib { +struct wfx_hif_req_read_mib { __le16 mib_id; __le16 reserved; } __packed; -struct hif_cnf_read_mib { +struct wfx_hif_cnf_read_mib { __le32 status; __le16 mib_id; __le16 length; u8 mib_data[]; } __packed; -struct hif_req_write_mib { +struct wfx_hif_req_write_mib { __le16 mib_id; __le16 length; u8 mib_data[]; } __packed; -struct hif_cnf_write_mib { +struct wfx_hif_cnf_write_mib { __le32 status; } __packed; -struct hif_req_update_ie { +struct wfx_hif_req_update_ie { u8 beacon:1; u8 probe_resp:1; u8 probe_req:1; @@ -103,11 +103,11 @@ struct hif_req_update_ie { u8 ie[]; } __packed; -struct hif_cnf_update_ie { +struct wfx_hif_cnf_update_ie { __le32 status; } __packed; -struct hif_ssid_def { +struct wfx_hif_ssid_def { __le32 ssid_length; u8 ssid[IEEE80211_MAX_SSID_LEN]; } __packed; @@ -115,7 +115,7 @@ struct hif_ssid_def { #define HIF_API_MAX_NB_SSIDS 2 #define HIF_API_MAX_NB_CHANNELS 14 -struct hif_req_start_scan_alt { +struct wfx_hif_req_start_scan_alt { u8 band; u8 maintain_current_bss:1; u8 periodic:1; @@ -135,45 +135,45 @@ struct hif_req_start_scan_alt { __le32 min_channel_time; __le32 max_channel_time; __le32 tx_power_level; /* signed value */ - struct hif_ssid_def ssid_def[HIF_API_MAX_NB_SSIDS]; + struct wfx_hif_ssid_def ssid_def[HIF_API_MAX_NB_SSIDS]; u8 channel_list[]; } __packed; -struct hif_cnf_start_scan { +struct wfx_hif_cnf_start_scan { __le32 status; } __packed; -struct hif_cnf_stop_scan { +struct wfx_hif_cnf_stop_scan { __le32 status; } __packed; -enum hif_pm_mode_status { +enum wfx_hif_pm_mode_status { HIF_PM_MODE_ACTIVE = 0x0, HIF_PM_MODE_PS = 0x1, HIF_PM_MODE_UNDETERMINED = 0x2 }; -struct hif_ind_scan_cmpl { +struct wfx_hif_ind_scan_cmpl { __le32 status; u8 pm_mode; u8 num_channels_completed; __le16 reserved; } __packed; -enum hif_queue_id { +enum wfx_hif_queue_id { HIF_QUEUE_ID_BACKGROUND = 0x0, HIF_QUEUE_ID_BESTEFFORT = 0x1, HIF_QUEUE_ID_VIDEO = 0x2, HIF_QUEUE_ID_VOICE = 0x3 }; -enum hif_frame_format { +enum wfx_hif_frame_format { HIF_FRAME_FORMAT_NON_HT = 0x0, HIF_FRAME_FORMAT_MIXED_FORMAT_HT = 0x1, HIF_FRAME_FORMAT_GF_HT_11N = 0x2 }; -struct hif_req_tx { +struct wfx_hif_req_tx { /* packet_id is not interpreted by the device, so it is not necessary to * declare it little endian */ @@ -203,16 +203,16 @@ struct hif_req_tx { u8 frame[]; } __packed; -enum hif_qos_ackplcy { +enum wfx_hif_qos_ackplcy { HIF_QOS_ACKPLCY_NORMAL = 0x0, HIF_QOS_ACKPLCY_TXNOACK = 0x1, HIF_QOS_ACKPLCY_NOEXPACK = 0x2, HIF_QOS_ACKPLCY_BLCKACK = 0x3 }; -struct hif_cnf_tx { +struct wfx_hif_cnf_tx { __le32 status; - /* packet_id is copied from struct hif_req_tx without been interpreted + /* packet_id is copied from struct wfx_hif_req_tx without been interpreted * by the device, so it is not necessary to declare it little endian */ u32 packet_id; @@ -228,13 +228,13 @@ struct hif_cnf_tx { __le32 tx_queue_delay; } __packed; -struct hif_cnf_multi_transmit { +struct wfx_hif_cnf_multi_transmit { u8 num_tx_confs; u8 reserved[3]; - struct hif_cnf_tx tx_conf_payload[]; + struct wfx_hif_cnf_tx tx_conf_payload[]; } __packed; -enum hif_ri_flags_encrypt { +enum wfx_hif_ri_flags_encrypt { HIF_RI_FLAGS_UNENCRYPTED = 0x0, HIF_RI_FLAGS_WEP_ENCRYPTED = 0x1, HIF_RI_FLAGS_TKIP_ENCRYPTED = 0x2, @@ -242,7 +242,7 @@ enum hif_ri_flags_encrypt { HIF_RI_FLAGS_WAPI_ENCRYPTED = 0x4 }; -struct hif_ind_rx { +struct wfx_hif_ind_rx { __le32 status; u8 channel_number; u8 reserved1; @@ -274,7 +274,7 @@ struct hif_ind_rx { u8 frame[]; } __packed; -struct hif_req_edca_queue_params { +struct wfx_hif_req_edca_queue_params { u8 queue_id; u8 reserved1; u8 aifsn; @@ -286,11 +286,11 @@ struct hif_req_edca_queue_params { __le32 reserved3; } __packed; -struct hif_cnf_edca_queue_params { +struct wfx_hif_cnf_edca_queue_params { __le32 status; } __packed; -struct hif_req_join { +struct wfx_hif_req_join { u8 infrastructure_bss_mode:1; u8 reserved1:7; u8 band; @@ -312,15 +312,15 @@ struct hif_req_join { __le32 basic_rate_set; } __packed; -struct hif_cnf_join { +struct wfx_hif_cnf_join { __le32 status; } __packed; -struct hif_ind_join_complete { +struct wfx_hif_ind_join_complete { __le32 status; } __packed; -struct hif_req_set_bss_params { +struct wfx_hif_req_set_bss_params { u8 lost_count_only:1; u8 reserved:7; u8 beacon_lost_count; @@ -328,11 +328,11 @@ struct hif_req_set_bss_params { __le32 operational_rate_set; } __packed; -struct hif_cnf_set_bss_params { +struct wfx_hif_cnf_set_bss_params { __le32 status; } __packed; -struct hif_req_set_pm_mode { +struct wfx_hif_req_set_pm_mode { u8 enter_psm:1; u8 reserved:6; u8 fast_psm:1; @@ -341,17 +341,17 @@ struct hif_req_set_pm_mode { u8 min_auto_ps_poll_period; } __packed; -struct hif_cnf_set_pm_mode { +struct wfx_hif_cnf_set_pm_mode { __le32 status; } __packed; -struct hif_ind_set_pm_mode_cmpl { +struct wfx_hif_ind_set_pm_mode_cmpl { __le32 status; u8 pm_mode; u8 reserved[3]; } __packed; -struct hif_req_start { +struct wfx_hif_req_start { u8 mode; u8 band; u8 channel_number; @@ -367,23 +367,23 @@ struct hif_req_start { __le32 basic_rate_set; } __packed; -struct hif_cnf_start { +struct wfx_hif_cnf_start { __le32 status; } __packed; -struct hif_req_beacon_transmit { +struct wfx_hif_req_beacon_transmit { u8 enable_beaconing; u8 reserved[3]; } __packed; -struct hif_cnf_beacon_transmit { +struct wfx_hif_cnf_beacon_transmit { __le32 status; } __packed; #define HIF_LINK_ID_MAX 14 #define HIF_LINK_ID_NOT_ASSOCIATED (HIF_LINK_ID_MAX + 1) -struct hif_req_map_link { +struct wfx_hif_req_map_link { u8 mac_addr[ETH_ALEN]; u8 unmap:1; u8 mfpc:1; @@ -391,11 +391,11 @@ struct hif_req_map_link { u8 peer_sta_id; } __packed; -struct hif_cnf_map_link { +struct wfx_hif_cnf_map_link { __le32 status; } __packed; -struct hif_ind_suspend_resume_tx { +struct wfx_hif_ind_suspend_resume_tx { u8 resume:1; u8 reserved1:2; u8 bc_mc_only:1; @@ -417,7 +417,7 @@ struct hif_ind_suspend_resume_tx { #define HIF_API_RX_SEQUENCE_COUNTER_SIZE 8 #define HIF_API_IPN_SIZE 8 -enum hif_key_type { +enum wfx_hif_key_type { HIF_KEY_TYPE_WEP_DEFAULT = 0x0, HIF_KEY_TYPE_WEP_PAIRWISE = 0x1, HIF_KEY_TYPE_TKIP_GROUP = 0x2, @@ -430,21 +430,21 @@ enum hif_key_type { HIF_KEY_TYPE_NONE = 0x9 }; -struct hif_wep_pairwise_key { +struct wfx_hif_wep_pairwise_key { u8 peer_address[ETH_ALEN]; u8 reserved; u8 key_length; u8 key_data[HIF_API_WEP_KEY_DATA_SIZE]; } __packed; -struct hif_wep_group_key { +struct wfx_hif_wep_group_key { u8 key_id; u8 key_length; u8 reserved[2]; u8 key_data[HIF_API_WEP_KEY_DATA_SIZE]; } __packed; -struct hif_tkip_pairwise_key { +struct wfx_hif_tkip_pairwise_key { u8 peer_address[ETH_ALEN]; u8 reserved[2]; u8 tkip_key_data[HIF_API_TKIP_KEY_DATA_SIZE]; @@ -452,7 +452,7 @@ struct hif_tkip_pairwise_key { u8 tx_mic_key[HIF_API_TX_MIC_KEY_SIZE]; } __packed; -struct hif_tkip_group_key { +struct wfx_hif_tkip_group_key { u8 tkip_key_data[HIF_API_TKIP_KEY_DATA_SIZE]; u8 rx_mic_key[HIF_API_RX_MIC_KEY_SIZE]; u8 key_id; @@ -460,20 +460,20 @@ struct hif_tkip_group_key { u8 rx_sequence_counter[HIF_API_RX_SEQUENCE_COUNTER_SIZE]; } __packed; -struct hif_aes_pairwise_key { +struct wfx_hif_aes_pairwise_key { u8 peer_address[ETH_ALEN]; u8 reserved[2]; u8 aes_key_data[HIF_API_AES_KEY_DATA_SIZE]; } __packed; -struct hif_aes_group_key { +struct wfx_hif_aes_group_key { u8 aes_key_data[HIF_API_AES_KEY_DATA_SIZE]; u8 key_id; u8 reserved[3]; u8 rx_sequence_counter[HIF_API_RX_SEQUENCE_COUNTER_SIZE]; } __packed; -struct hif_wapi_pairwise_key { +struct wfx_hif_wapi_pairwise_key { u8 peer_address[ETH_ALEN]; u8 key_id; u8 reserved; @@ -481,53 +481,53 @@ struct hif_wapi_pairwise_key { u8 mic_key_data[HIF_API_MIC_KEY_DATA_SIZE]; } __packed; -struct hif_wapi_group_key { +struct wfx_hif_wapi_group_key { u8 wapi_key_data[HIF_API_WAPI_KEY_DATA_SIZE]; u8 mic_key_data[HIF_API_MIC_KEY_DATA_SIZE]; u8 key_id; u8 reserved[3]; } __packed; -struct hif_igtk_group_key { +struct wfx_hif_igtk_group_key { u8 igtk_key_data[HIF_API_IGTK_KEY_DATA_SIZE]; u8 key_id; u8 reserved[3]; u8 ipn[HIF_API_IPN_SIZE]; } __packed; -struct hif_req_add_key { +struct wfx_hif_req_add_key { u8 type; u8 entry_index; u8 int_id:2; u8 reserved1:6; u8 reserved2; union { - struct hif_wep_pairwise_key wep_pairwise_key; - struct hif_wep_group_key wep_group_key; - struct hif_tkip_pairwise_key tkip_pairwise_key; - struct hif_tkip_group_key tkip_group_key; - struct hif_aes_pairwise_key aes_pairwise_key; - struct hif_aes_group_key aes_group_key; - struct hif_wapi_pairwise_key wapi_pairwise_key; - struct hif_wapi_group_key wapi_group_key; - struct hif_igtk_group_key igtk_group_key; + struct wfx_hif_wep_pairwise_key wep_pairwise_key; + struct wfx_hif_wep_group_key wep_group_key; + struct wfx_hif_tkip_pairwise_key tkip_pairwise_key; + struct wfx_hif_tkip_group_key tkip_group_key; + struct wfx_hif_aes_pairwise_key aes_pairwise_key; + struct wfx_hif_aes_group_key aes_group_key; + struct wfx_hif_wapi_pairwise_key wapi_pairwise_key; + struct wfx_hif_wapi_group_key wapi_group_key; + struct wfx_hif_igtk_group_key igtk_group_key; } key; } __packed; -struct hif_cnf_add_key { +struct wfx_hif_cnf_add_key { __le32 status; } __packed; -struct hif_req_remove_key { +struct wfx_hif_req_remove_key { u8 entry_index; u8 reserved[3]; } __packed; -struct hif_cnf_remove_key { +struct wfx_hif_cnf_remove_key { __le32 status; } __packed; -enum hif_event_ind { +enum wfx_hif_event_ind { HIF_EVENT_IND_BSSLOST = 0x1, HIF_EVENT_IND_BSSREGAINED = 0x2, HIF_EVENT_IND_RCPI_RSSI = 0x3, @@ -535,7 +535,7 @@ enum hif_event_ind { HIF_EVENT_IND_INACTIVITY = 0x5 }; -enum hif_ps_mode_error { +enum wfx_hif_ps_mode_error { HIF_PS_ERROR_NO_ERROR = 0, HIF_PS_ERROR_AP_NOT_RESP_TO_POLL = 1, HIF_PS_ERROR_AP_NOT_RESP_TO_UAPSD_TRIGGER = 2, @@ -543,7 +543,7 @@ enum hif_ps_mode_error { HIF_PS_ERROR_AP_NO_DATA_AFTER_TIM = 4 }; -struct hif_ind_event { +struct wfx_hif_ind_event { __le32 event_id; union { u8 rcpi_rssi; diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h index a57789ceb209..4d400fdc2252 100644 --- a/drivers/staging/wfx/hif_api_general.h +++ b/drivers/staging/wfx/hif_api_general.h @@ -14,7 +14,7 @@ #define HIF_ID_IS_INDICATION 0x80 #define HIF_COUNTER_MAX 7 -struct hif_msg { +struct wfx_hif_msg { __le16 len; u8 id; u8 reserved:1; @@ -24,7 +24,7 @@ struct hif_msg { u8 body[]; } __packed; -enum hif_general_requests_ids { +enum wfx_hif_general_requests_ids { HIF_REQ_ID_CONFIGURATION = 0x09, HIF_REQ_ID_CONTROL_GPIO = 0x26, HIF_REQ_ID_SET_SL_MAC_KEY = 0x27, @@ -37,7 +37,7 @@ enum hif_general_requests_ids { HIF_REQ_ID_SHUT_DOWN = 0x32, }; -enum hif_general_confirmations_ids { +enum wfx_hif_general_confirmations_ids { HIF_CNF_ID_CONFIGURATION = 0x09, HIF_CNF_ID_CONTROL_GPIO = 0x26, HIF_CNF_ID_SET_SL_MAC_KEY = 0x27, @@ -50,7 +50,7 @@ enum hif_general_confirmations_ids { HIF_CNF_ID_SHUT_DOWN = 0x32, }; -enum hif_general_indications_ids { +enum wfx_hif_general_indications_ids { HIF_IND_ID_EXCEPTION = 0xe0, HIF_IND_ID_STARTUP = 0xe1, HIF_IND_ID_WAKEUP = 0xe2, @@ -81,7 +81,7 @@ enum hif_general_indications_ids { #define HIF_STATUS_ROLLBACK_SUCCESS (cpu_to_le32(0x1234)) #define HIF_STATUS_ROLLBACK_FAIL (cpu_to_le32(0x1256)) -enum hif_api_rate_index { +enum wfx_hif_api_rate_index { API_RATE_INDEX_B_1MBPS = 0, API_RATE_INDEX_B_2MBPS = 1, API_RATE_INDEX_B_5P5MBPS = 2, @@ -107,7 +107,7 @@ enum hif_api_rate_index { API_RATE_NUM_ENTRIES = 22 }; -struct hif_ind_startup { +struct wfx_hif_ind_startup { __le32 status; __le16 hardware_id; u8 opn[14]; @@ -138,19 +138,19 @@ struct hif_ind_startup { u8 firmware_label[128]; } __packed; -struct hif_ind_wakeup { +struct wfx_hif_ind_wakeup { } __packed; -struct hif_req_configuration { +struct wfx_hif_req_configuration { __le16 length; u8 pds_data[]; } __packed; -struct hif_cnf_configuration { +struct wfx_hif_cnf_configuration { __le32 status; } __packed; -enum hif_gpio_mode { +enum wfx_hif_gpio_mode { HIF_GPIO_MODE_D0 = 0x0, HIF_GPIO_MODE_D1 = 0x1, HIF_GPIO_MODE_OD0 = 0x2, @@ -160,24 +160,24 @@ enum hif_gpio_mode { HIF_GPIO_MODE_READ = 0x6 }; -struct hif_req_control_gpio { +struct wfx_hif_req_control_gpio { u8 gpio_label; u8 gpio_mode; } __packed; -struct hif_cnf_control_gpio { +struct wfx_hif_cnf_control_gpio { __le32 status; __le32 value; } __packed; -enum hif_generic_indication_type { +enum wfx_hif_generic_indication_type { HIF_GENERIC_INDICATION_TYPE_RAW = 0x0, HIF_GENERIC_INDICATION_TYPE_STRING = 0x1, HIF_GENERIC_INDICATION_TYPE_RX_STATS = 0x2, HIF_GENERIC_INDICATION_TYPE_TX_POWER_LOOP_INFO = 0x3, }; -struct hif_rx_stats { +struct wfx_hif_rx_stats { __le32 nb_rx_frame; __le32 nb_crc_frame; __le32 per_total; @@ -193,7 +193,7 @@ struct hif_rx_stats { s8 current_temp; } __packed; -struct hif_tx_power_loop_info { +struct wfx_hif_tx_power_loop_info { __le16 tx_gain_dig; __le16 tx_gain_pa; __le16 target_pout; /* signed value */ @@ -203,15 +203,15 @@ struct hif_tx_power_loop_info { u8 reserved; } __packed; -struct hif_ind_generic { +struct wfx_hif_ind_generic { __le32 type; union { - struct hif_rx_stats rx_stats; - struct hif_tx_power_loop_info tx_power_loop_info; + struct wfx_hif_rx_stats rx_stats; + struct wfx_hif_tx_power_loop_info tx_power_loop_info; } data; } __packed; -enum hif_error { +enum wfx_hif_error { HIF_ERROR_FIRMWARE_ROLLBACK = 0x00, HIF_ERROR_FIRMWARE_DEBUG_ENABLED = 0x01, HIF_ERROR_SLK_OUTDATED_SESSION_KEY = 0x02, @@ -232,17 +232,17 @@ enum hif_error { HIF_ERROR_SLK_UNCONFIGURED = 0x11, }; -struct hif_ind_error { +struct wfx_hif_ind_error { __le32 type; u8 data[]; } __packed; -struct hif_ind_exception { +struct wfx_hif_ind_exception { __le32 type; u8 data[]; } __packed; -enum hif_secure_link_state { +enum wfx_hif_secure_link_state { SEC_LINK_UNAVAILABLE = 0x0, SEC_LINK_RESERVED = 0x1, SEC_LINK_EVAL = 0x2, diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h index be76e2766880..7b68b83866c9 100644 --- a/drivers/staging/wfx/hif_api_mib.h +++ b/drivers/staging/wfx/hif_api_mib.h @@ -13,7 +13,7 @@ #define HIF_API_IPV4_ADDRESS_SIZE 4 #define HIF_API_IPV6_ADDRESS_SIZE 16 -enum hif_mib_ids { +enum wfx_hif_mib_ids { HIF_MIB_ID_GL_OPERATIONAL_POWER_MODE = 0x2000, HIF_MIB_ID_GL_BLOCK_ACK_INFO = 0x2001, HIF_MIB_ID_GL_SET_MULTI_MSG = 0x2002, @@ -63,39 +63,39 @@ enum hif_mib_ids { HIF_MIB_ID_BEACON_STATS = 0x2056, }; -enum hif_op_power_mode { +enum wfx_hif_op_power_mode { HIF_OP_POWER_MODE_ACTIVE = 0x0, HIF_OP_POWER_MODE_DOZE = 0x1, HIF_OP_POWER_MODE_QUIESCENT = 0x2 }; -struct hif_mib_gl_operational_power_mode { +struct wfx_hif_mib_gl_operational_power_mode { u8 power_mode:4; u8 reserved1:3; u8 wup_ind_activation:1; u8 reserved2[3]; } __packed; -struct hif_mib_gl_set_multi_msg { +struct wfx_hif_mib_gl_set_multi_msg { u8 enable_multi_tx_conf:1; u8 reserved1:7; u8 reserved2[3]; } __packed; -enum hif_arp_ns_frame_treatment { +enum wfx_hif_arp_ns_frame_treatment { HIF_ARP_NS_FILTERING_DISABLE = 0x0, HIF_ARP_NS_FILTERING_ENABLE = 0x1, HIF_ARP_NS_REPLY_ENABLE = 0x2 }; -struct hif_mib_arp_ip_addr_table { +struct wfx_hif_mib_arp_ip_addr_table { u8 condition_idx; u8 arp_enable; u8 reserved[2]; u8 ipv4_address[HIF_API_IPV4_ADDRESS_SIZE]; } __packed; -struct hif_mib_rx_filter { +struct wfx_hif_mib_rx_filter { u8 reserved1:1; u8 bssid_filter:1; u8 reserved2:1; @@ -105,7 +105,7 @@ struct hif_mib_rx_filter { u8 reserved4[3]; } __packed; -struct hif_ie_table_entry { +struct wfx_hif_ie_table_entry { u8 ie_id; u8 has_changed:1; u8 no_longer:1; @@ -116,23 +116,23 @@ struct hif_ie_table_entry { u8 match_data[3]; } __packed; -struct hif_mib_bcn_filter_table { +struct wfx_hif_mib_bcn_filter_table { __le32 num_of_info_elmts; - struct hif_ie_table_entry ie_table[]; + struct wfx_hif_ie_table_entry ie_table[]; } __packed; -enum hif_beacon_filter { +enum wfx_hif_beacon_filter { HIF_BEACON_FILTER_DISABLE = 0x0, HIF_BEACON_FILTER_ENABLE = 0x1, HIF_BEACON_FILTER_AUTO_ERP = 0x2 }; -struct hif_mib_bcn_filter_enable { +struct wfx_hif_mib_bcn_filter_enable { __le32 enable; __le32 bcn_count; } __packed; -struct hif_mib_extended_count_table { +struct wfx_hif_mib_extended_count_table { __le32 count_drop_plcp; __le32 count_drop_fcs; __le32 count_tx_frames; @@ -164,7 +164,7 @@ struct hif_mib_extended_count_table { __le32 reserved[12]; } __packed; -struct hif_mib_count_table { +struct wfx_hif_mib_count_table { __le32 count_drop_plcp; __le32 count_drop_fcs; __le32 count_tx_frames; @@ -190,35 +190,35 @@ struct hif_mib_count_table { __le32 count_drop_bip_mic; } __packed; -struct hif_mib_mac_address { +struct wfx_hif_mib_mac_address { u8 mac_addr[ETH_ALEN]; __le16 reserved; } __packed; -struct hif_mib_wep_default_key_id { +struct wfx_hif_mib_wep_default_key_id { u8 wep_default_key_id; u8 reserved[3]; } __packed; -struct hif_mib_dot11_rts_threshold { +struct wfx_hif_mib_dot11_rts_threshold { __le32 threshold; } __packed; -struct hif_mib_slot_time { +struct wfx_hif_mib_slot_time { __le32 slot_time; } __packed; -struct hif_mib_current_tx_power_level { +struct wfx_hif_mib_current_tx_power_level { __le32 power_level; /* signed value */ } __packed; -struct hif_mib_non_erp_protection { +struct wfx_hif_mib_non_erp_protection { u8 use_cts_to_self:1; u8 reserved1:7; u8 reserved2[3]; } __packed; -enum hif_tmplt { +enum wfx_hif_tmplt { HIF_TMPLT_PRBREQ = 0x0, HIF_TMPLT_BCN = 0x1, HIF_TMPLT_NULL = 0x2, @@ -231,7 +231,7 @@ enum hif_tmplt { #define HIF_API_MAX_TEMPLATE_FRAME_SIZE 700 -struct hif_mib_template_frame { +struct wfx_hif_mib_template_frame { u8 frame_type; u8 init_rate:7; u8 mode:1; @@ -239,7 +239,7 @@ struct hif_mib_template_frame { u8 frame[]; } __packed; -struct hif_mib_beacon_wake_up_period { +struct wfx_hif_mib_beacon_wake_up_period { u8 wakeup_period_min; u8 receive_dtim:1; u8 reserved1:7; @@ -247,7 +247,7 @@ struct hif_mib_beacon_wake_up_period { u8 reserved2; } __packed; -struct hif_mib_rcpi_rssi_threshold { +struct wfx_hif_mib_rcpi_rssi_threshold { u8 detection:1; u8 rcpi_rssi:1; u8 upperthresh:1; @@ -260,14 +260,14 @@ struct hif_mib_rcpi_rssi_threshold { #define DEFAULT_BA_MAX_RX_BUFFER_SIZE 16 -struct hif_mib_block_ack_policy { +struct wfx_hif_mib_block_ack_policy { u8 block_ack_tx_tid_policy; u8 reserved1; u8 block_ack_rx_tid_policy; u8 block_ack_rx_max_buffer_size; } __packed; -enum hif_mpdu_start_spacing { +enum wfx_hif_mpdu_start_spacing { HIF_MPDU_START_SPACING_NO_RESTRIC = 0x0, HIF_MPDU_START_SPACING_QUARTER = 0x1, HIF_MPDU_START_SPACING_HALF = 0x2, @@ -278,7 +278,7 @@ enum hif_mpdu_start_spacing { HIF_MPDU_START_SPACING_SIXTEEN = 0x7 }; -struct hif_mib_set_association_mode { +struct wfx_hif_mib_set_association_mode { u8 preambtype_use:1; u8 mode:1; u8 rateset:1; @@ -292,7 +292,7 @@ struct hif_mib_set_association_mode { __le32 basic_rate_set; } __packed; -struct hif_mib_set_uapsd_information { +struct wfx_hif_mib_set_uapsd_information { u8 trig_bckgrnd:1; u8 trig_be:1; u8 trig_video:1; @@ -308,7 +308,7 @@ struct hif_mib_set_uapsd_information { __le16 auto_trigger_step; } __packed; -struct hif_tx_rate_retry_policy { +struct wfx_hif_tx_rate_retry_policy { u8 policy_index; u8 short_retry_count; u8 long_retry_count; @@ -324,13 +324,13 @@ struct hif_tx_rate_retry_policy { #define HIF_TX_RETRY_POLICY_MAX 15 #define HIF_TX_RETRY_POLICY_INVALID HIF_TX_RETRY_POLICY_MAX -struct hif_mib_set_tx_rate_retry_policy { +struct wfx_hif_mib_set_tx_rate_retry_policy { u8 num_tx_rate_policies; u8 reserved[3]; - struct hif_tx_rate_retry_policy tx_rate_retry_policy[]; + struct wfx_hif_tx_rate_retry_policy tx_rate_retry_policy[]; } __packed; -struct hif_mib_protected_mgmt_policy { +struct wfx_hif_mib_protected_mgmt_policy { u8 pmf_enable:1; u8 unpmf_allowed:1; u8 host_enc_auth_frames:1; @@ -338,7 +338,7 @@ struct hif_mib_protected_mgmt_policy { u8 reserved2[3]; } __packed; -struct hif_mib_keep_alive_period { +struct wfx_hif_mib_keep_alive_period { __le16 keep_alive_period; u8 reserved[2]; } __packed; diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 7a2a32e3ceb9..f2564a20bdcf 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -17,7 +17,7 @@ #include "hif_api_cmd.h" static int wfx_hif_generic_confirm(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf) + const struct wfx_hif_msg *hif, const void *buf) { /* All confirm messages start with status */ int status = le32_to_cpup((__le32 *)buf); @@ -51,18 +51,18 @@ static int wfx_hif_generic_confirm(struct wfx_dev *wdev, } static int wfx_hif_tx_confirm(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf) + const struct wfx_hif_msg *hif, const void *buf) { - const struct hif_cnf_tx *body = buf; + const struct wfx_hif_cnf_tx *body = buf; wfx_tx_confirm_cb(wdev, body); return 0; } static int wfx_hif_multi_tx_confirm(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf) + const struct wfx_hif_msg *hif, const void *buf) { - const struct hif_cnf_multi_transmit *body = buf; + const struct wfx_hif_cnf_multi_transmit *body = buf; int i; WARN(body->num_tx_confs <= 0, "corrupted message"); @@ -72,22 +72,23 @@ static int wfx_hif_multi_tx_confirm(struct wfx_dev *wdev, } static int wfx_hif_startup_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf) { - const struct hif_ind_startup *body = buf; + const struct wfx_hif_ind_startup *body = buf; if (body->status || body->firmware_type > 4) { dev_err(wdev->dev, "received invalid startup indication"); return -EINVAL; } - memcpy(&wdev->hw_caps, body, sizeof(struct hif_ind_startup)); + memcpy(&wdev->hw_caps, body, sizeof(struct wfx_hif_ind_startup)); complete(&wdev->firmware_ready); return 0; } static int wfx_hif_wakeup_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf) + const struct wfx_hif_msg *hif, + const void *buf) { if (!wdev->pdata.gpio_wakeup || gpiod_get_value(wdev->pdata.gpio_wakeup) == 0) { @@ -98,28 +99,28 @@ static int wfx_hif_wakeup_indication(struct wfx_dev *wdev, } static int wfx_hif_receive_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf, struct sk_buff *skb) { struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); - const struct hif_ind_rx *body = buf; + const struct wfx_hif_ind_rx *body = buf; if (!wvif) { dev_warn(wdev->dev, "%s: ignore rx data for non-existent vif %d\n", __func__, hif->interface); return -EIO; } - skb_pull(skb, sizeof(struct hif_msg) + sizeof(struct hif_ind_rx)); + skb_pull(skb, sizeof(struct wfx_hif_msg) + sizeof(struct hif_ind_rx)); wfx_rx_cb(wvif, body, skb); return 0; } static int wfx_hif_event_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf) + const struct wfx_hif_msg *hif, const void *buf) { struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); - const struct hif_ind_event *body = buf; + const struct wfx_hif_ind_event *body = buf; int type = le32_to_cpu(body->event_id); if (!wvif) { @@ -151,7 +152,7 @@ static int wfx_hif_event_indication(struct wfx_dev *wdev, } static int wfx_hif_pm_mode_complete_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf) { struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); @@ -166,11 +167,11 @@ static int wfx_hif_pm_mode_complete_indication(struct wfx_dev *wdev, } static int wfx_hif_scan_complete_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf) { struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); - const struct hif_ind_scan_cmpl *body = buf; + const struct wfx_hif_ind_scan_cmpl *body = buf; if (!wvif) { dev_warn(wdev->dev, "%s: received event for non-existent vif\n", __func__); @@ -183,7 +184,7 @@ static int wfx_hif_scan_complete_indication(struct wfx_dev *wdev, } static int wfx_hif_join_complete_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf) { struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); @@ -198,10 +199,10 @@ static int wfx_hif_join_complete_indication(struct wfx_dev *wdev, } static int wfx_hif_suspend_resume_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf) { - const struct hif_ind_suspend_resume_tx *body = buf; + const struct wfx_hif_ind_suspend_resume_tx *body = buf; struct wfx_vif *wvif; if (body->bc_mc_only) { @@ -227,10 +228,10 @@ static int wfx_hif_suspend_resume_indication(struct wfx_dev *wdev, } static int wfx_hif_generic_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf) { - const struct hif_ind_generic *body = buf; + const struct wfx_hif_ind_generic *body = buf; int type = le32_to_cpu(body->type); switch (type) { @@ -308,9 +309,9 @@ static const struct { }; static int wfx_hif_error_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf) + const struct wfx_hif_msg *hif, const void *buf) { - const struct hif_ind_error *body = buf; + const struct wfx_hif_ind_error *body = buf; int type = le32_to_cpu(body->type); int param = (s8)body->data[0]; int i; @@ -335,10 +336,10 @@ static int wfx_hif_error_indication(struct wfx_dev *wdev, }; static int wfx_hif_exception_indication(struct wfx_dev *wdev, - const struct hif_msg *hif, + const struct wfx_hif_msg *hif, const void *buf) { - const struct hif_ind_exception *body = buf; + const struct wfx_hif_ind_exception *body = buf; int type = le32_to_cpu(body->type); if (type == 4) @@ -356,7 +357,7 @@ static int wfx_hif_exception_indication(struct wfx_dev *wdev, static const struct { int msg_id; int (*handler)(struct wfx_dev *wdev, - const struct hif_msg *hif, const void *buf); + const struct wfx_hif_msg *hif, const void *buf); } hif_handlers[] = { /* Confirmations */ { HIF_CNF_ID_TX, wfx_hif_tx_confirm }, @@ -379,7 +380,7 @@ static const struct { void wfx_handle_rx(struct wfx_dev *wdev, struct sk_buff *skb) { int i; - const struct hif_msg *hif = (const struct hif_msg *)skb->data; + const struct wfx_hif_msg *hif = (const struct hif_msg *)skb->data; int hif_id = hif->id; if (hif_id == HIF_IND_ID_RX) { diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 67f1847c1fc1..429c70b991e1 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -22,7 +22,7 @@ void wfx_init_hif_cmd(struct wfx_hif_cmd *hif_cmd) mutex_init(&hif_cmd->lock); } -static void wfx_fill_header(struct hif_msg *hif, int if_id, +static void wfx_fill_header(struct wfx_hif_msg *hif, int if_id, unsigned int cmd, size_t size) { if (if_id == -1) @@ -37,16 +37,16 @@ static void wfx_fill_header(struct hif_msg *hif, int if_id, hif->interface = if_id; } -static void *wfx_alloc_hif(size_t body_len, struct hif_msg **hif) +static void *wfx_alloc_hif(size_t body_len, struct wfx_hif_msg **hif) { - *hif = kzalloc(sizeof(struct hif_msg) + body_len, GFP_KERNEL); + *hif = kzalloc(sizeof(struct wfx_hif_msg) + body_len, GFP_KERNEL); if (*hif) return (*hif)->body; else return NULL; } -int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, +int wfx_cmd_send(struct wfx_dev *wdev, struct wfx_hif_msg *request, void *reply, size_t reply_len, bool no_reply) { const char *mib_name = ""; @@ -125,7 +125,7 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, int wfx_hif_shutdown(struct wfx_dev *wdev) { int ret; - struct hif_msg *hif; + struct wfx_hif_msg *hif; wfx_alloc_hif(0, &hif); if (!hif) @@ -143,9 +143,9 @@ int wfx_hif_shutdown(struct wfx_dev *wdev) int wfx_hif_configuration(struct wfx_dev *wdev, const u8 *conf, size_t len) { int ret; - size_t buf_len = sizeof(struct hif_req_configuration) + len; - struct hif_msg *hif; - struct hif_req_configuration *body = wfx_alloc_hif(buf_len, &hif); + size_t buf_len = sizeof(struct wfx_hif_req_configuration) + len; + struct wfx_hif_msg *hif; + struct wfx_hif_req_configuration *body = wfx_alloc_hif(buf_len, &hif); if (!hif) return -ENOMEM; @@ -160,8 +160,8 @@ int wfx_hif_configuration(struct wfx_dev *wdev, const u8 *conf, size_t len) int wfx_hif_reset(struct wfx_vif *wvif, bool reset_stat) { int ret; - struct hif_msg *hif; - struct hif_req_reset *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_reset *body = wfx_alloc_hif(sizeof(*body), &hif); if (!hif) return -ENOMEM; @@ -176,10 +176,10 @@ int wfx_hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, void *val, size_t val_len) { int ret; - struct hif_msg *hif; - int buf_len = sizeof(struct hif_cnf_read_mib) + val_len; - struct hif_req_read_mib *body = wfx_alloc_hif(sizeof(*body), &hif); - struct hif_cnf_read_mib *reply = kmalloc(buf_len, GFP_KERNEL); + struct wfx_hif_msg *hif; + int buf_len = sizeof(struct wfx_hif_cnf_read_mib) + val_len; + struct wfx_hif_req_read_mib *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_cnf_read_mib *reply = kmalloc(buf_len, GFP_KERNEL); if (!body || !reply) { ret = -ENOMEM; @@ -212,9 +212,9 @@ int wfx_hif_write_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, void *val, size_t val_len) { int ret; - struct hif_msg *hif; - int buf_len = sizeof(struct hif_req_write_mib) + val_len; - struct hif_req_write_mib *body = wfx_alloc_hif(buf_len, &hif); + struct wfx_hif_msg *hif; + int buf_len = sizeof(struct wfx_hif_req_write_mib) + val_len; + struct wfx_hif_req_write_mib *body = wfx_alloc_hif(buf_len, &hif); if (!hif) return -ENOMEM; @@ -231,10 +231,10 @@ int wfx_hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req, int chan_start_idx, int chan_num) { int ret, i; - struct hif_msg *hif; - size_t buf_len = - sizeof(struct hif_req_start_scan_alt) + chan_num * sizeof(u8); - struct hif_req_start_scan_alt *body = wfx_alloc_hif(buf_len, &hif); + struct wfx_hif_msg *hif; + size_t buf_len = sizeof(struct wfx_hif_req_start_scan_alt) + + chan_num * sizeof(u8); + struct wfx_hif_req_start_scan_alt *body = wfx_alloc_hif(buf_len, &hif); WARN(chan_num > HIF_API_MAX_NB_CHANNELS, "invalid params"); WARN(req->n_ssids > HIF_API_MAX_NB_SSIDS, "invalid params"); @@ -279,7 +279,7 @@ int wfx_hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req, int wfx_hif_stop_scan(struct wfx_vif *wvif) { int ret; - struct hif_msg *hif; + struct wfx_hif_msg *hif; /* body associated to HIF_REQ_ID_STOP_SCAN is empty */ wfx_alloc_hif(0, &hif); @@ -295,8 +295,8 @@ int wfx_hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, struct ieee80211_channel *channel, const u8 *ssid, int ssidlen) { int ret; - struct hif_msg *hif; - struct hif_req_join *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_join *body = wfx_alloc_hif(sizeof(*body), &hif); WARN_ON(!conf->beacon_int); WARN_ON(!conf->basic_rates); @@ -325,9 +325,9 @@ int wfx_hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, int wfx_hif_set_bss_params(struct wfx_vif *wvif, int aid, int beacon_lost_count) { int ret; - struct hif_msg *hif; - struct hif_req_set_bss_params *body = - wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_set_bss_params *body = wfx_alloc_hif(sizeof(*body), + &hif); if (!hif) return -ENOMEM; @@ -340,12 +340,12 @@ int wfx_hif_set_bss_params(struct wfx_vif *wvif, int aid, int beacon_lost_count) return ret; } -int wfx_hif_add_key(struct wfx_dev *wdev, const struct hif_req_add_key *arg) +int wfx_hif_add_key(struct wfx_dev *wdev, const struct wfx_hif_req_add_key *arg) { int ret; - struct hif_msg *hif; + struct wfx_hif_msg *hif; /* FIXME: only send necessary bits */ - struct hif_req_add_key *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_req_add_key *body = wfx_alloc_hif(sizeof(*body), &hif); if (!hif) return -ENOMEM; @@ -367,8 +367,8 @@ int wfx_hif_add_key(struct wfx_dev *wdev, const struct hif_req_add_key *arg) int wfx_hif_remove_key(struct wfx_dev *wdev, int idx) { int ret; - struct hif_msg *hif; - struct hif_req_remove_key *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_remove_key *body = wfx_alloc_hif(sizeof(*body), &hif); if (!hif) return -ENOMEM; @@ -383,9 +383,9 @@ int wfx_hif_set_edca_queue_params(struct wfx_vif *wvif, u16 queue, const struct ieee80211_tx_queue_params *arg) { int ret; - struct hif_msg *hif; - struct hif_req_edca_queue_params *body = wfx_alloc_hif(sizeof(*body), - &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_edca_queue_params *body = wfx_alloc_hif(sizeof(*body), + &hif); if (!body) return -ENOMEM; @@ -413,8 +413,9 @@ int wfx_hif_set_edca_queue_params(struct wfx_vif *wvif, u16 queue, int wfx_hif_set_pm(struct wfx_vif *wvif, bool ps, int dynamic_ps_timeout) { int ret; - struct hif_msg *hif; - struct hif_req_set_pm_mode *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_set_pm_mode *body = wfx_alloc_hif(sizeof(*body), + &hif); if (!body) return -ENOMEM; @@ -438,8 +439,8 @@ int wfx_hif_start(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, const struct ieee80211_channel *channel) { int ret; - struct hif_msg *hif; - struct hif_req_start *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_start *body = wfx_alloc_hif(sizeof(*body), &hif); WARN_ON(!conf->beacon_int); if (!hif) @@ -461,9 +462,9 @@ int wfx_hif_start(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, int wfx_hif_beacon_transmit(struct wfx_vif *wvif, bool enable) { int ret; - struct hif_msg *hif; - struct hif_req_beacon_transmit *body = wfx_alloc_hif(sizeof(*body), - &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_beacon_transmit *body = wfx_alloc_hif(sizeof(*body), + &hif); if (!hif) return -ENOMEM; @@ -479,8 +480,8 @@ int wfx_hif_map_link(struct wfx_vif *wvif, bool unmap, u8 *mac_addr, int sta_id, bool mfp) { int ret; - struct hif_msg *hif; - struct hif_req_map_link *body = wfx_alloc_hif(sizeof(*body), &hif); + struct wfx_hif_msg *hif; + struct wfx_hif_req_map_link *body = wfx_alloc_hif(sizeof(*body), &hif); if (!hif) return -ENOMEM; @@ -499,9 +500,9 @@ int wfx_hif_update_ie_beacon(struct wfx_vif *wvif, const u8 *ies, size_t ies_len) { int ret; - struct hif_msg *hif; - int buf_len = sizeof(struct hif_req_update_ie) + ies_len; - struct hif_req_update_ie *body = wfx_alloc_hif(buf_len, &hif); + struct wfx_hif_msg *hif; + int buf_len = sizeof(struct wfx_hif_req_update_ie) + ies_len; + struct wfx_hif_req_update_ie *body = wfx_alloc_hif(buf_len, &hif); if (!hif) return -ENOMEM; diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/staging/wfx/hif_tx.h index b28a2ee5350a..36caffa4d1eb 100644 --- a/drivers/staging/wfx/hif_tx.h +++ b/drivers/staging/wfx/hif_tx.h @@ -18,22 +18,22 @@ struct ieee80211_channel; struct ieee80211_bss_conf; struct ieee80211_tx_queue_params; struct cfg80211_scan_request; -struct hif_req_add_key; +struct wfx_hif_req_add_key; struct wfx_dev; struct wfx_vif; struct wfx_hif_cmd { - struct mutex lock; - struct completion ready; - struct completion done; - struct hif_msg *buf_send; - void *buf_recv; - size_t len_recv; - int ret; + struct mutex lock; + struct completion ready; + struct completion done; + struct wfx_hif_msg *buf_send; + void *buf_recv; + size_t len_recv; + int ret; }; void wfx_init_hif_cmd(struct wfx_hif_cmd *wfx_hif_cmd); -int wfx_cmd_send(struct wfx_dev *wdev, struct hif_msg *request, +int wfx_cmd_send(struct wfx_dev *wdev, struct wfx_hif_msg *request, void *reply, size_t reply_len, bool async); int wfx_hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, @@ -47,7 +47,7 @@ int wfx_hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, struct ieee80211_channel *channel, const u8 *ssid, int ssidlen); int wfx_hif_map_link(struct wfx_vif *wvif, bool unmap, u8 *mac_addr, int sta_id, bool mfp); -int wfx_hif_add_key(struct wfx_dev *wdev, const struct hif_req_add_key *arg); +int wfx_hif_add_key(struct wfx_dev *wdev, const struct wfx_hif_req_add_key *arg); int wfx_hif_remove_key(struct wfx_dev *wdev, int idx); int wfx_hif_set_pm(struct wfx_vif *wvif, bool ps, int dynamic_ps_timeout); int wfx_hif_set_bss_params(struct wfx_vif *wvif, int aid, int beacon_lost_count); diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c index b79ffdf6fcd2..daf966693f67 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/staging/wfx/hif_tx_mib.c @@ -16,7 +16,7 @@ int wfx_hif_set_output_power(struct wfx_vif *wvif, int val) { - struct hif_mib_current_tx_power_level arg = { + struct wfx_hif_mib_current_tx_power_level arg = { .power_level = cpu_to_le32(val * 10), }; @@ -29,7 +29,7 @@ int wfx_hif_set_beacon_wakeup_period(struct wfx_vif *wvif, unsigned int dtim_interval, unsigned int listen_interval) { - struct hif_mib_beacon_wake_up_period arg = { + struct wfx_hif_mib_beacon_wake_up_period arg = { .wakeup_period_min = dtim_interval, .receive_dtim = 0, .wakeup_period_max = listen_interval, @@ -45,7 +45,7 @@ int wfx_hif_set_beacon_wakeup_period(struct wfx_vif *wvif, int wfx_hif_set_rcpi_rssi_threshold(struct wfx_vif *wvif, int rssi_thold, int rssi_hyst) { - struct hif_mib_rcpi_rssi_threshold arg = { + struct wfx_hif_mib_rcpi_rssi_threshold arg = { .rolling_average_count = 8, .detection = 1, }; @@ -66,23 +66,23 @@ int wfx_hif_set_rcpi_rssi_threshold(struct wfx_vif *wvif, } int wfx_hif_get_counters_table(struct wfx_dev *wdev, int vif_id, - struct hif_mib_extended_count_table *arg) + struct wfx_hif_mib_extended_count_table *arg) { if (wfx_api_older_than(wdev, 1, 3)) { /* extended_count_table is wider than count_table */ memset(arg, 0xFF, sizeof(*arg)); return wfx_hif_read_mib(wdev, vif_id, HIF_MIB_ID_COUNTERS_TABLE, - arg, sizeof(struct hif_mib_count_table)); + arg, sizeof(struct wfx_hif_mib_count_table)); } else { return wfx_hif_read_mib(wdev, vif_id, HIF_MIB_ID_EXTENDED_COUNTERS_TABLE, arg, - sizeof(struct hif_mib_extended_count_table)); + sizeof(struct wfx_hif_mib_extended_count_table)); } } int wfx_hif_set_macaddr(struct wfx_vif *wvif, u8 *mac) { - struct hif_mib_mac_address arg = { }; + struct wfx_hif_mib_mac_address arg = { }; if (mac) ether_addr_copy(arg.mac_addr, mac); @@ -94,7 +94,7 @@ int wfx_hif_set_macaddr(struct wfx_vif *wvif, u8 *mac) int wfx_hif_set_rx_filter(struct wfx_vif *wvif, bool filter_bssid, bool filter_prbreq) { - struct hif_mib_rx_filter arg = { }; + struct wfx_hif_mib_rx_filter arg = { }; if (filter_bssid) arg.bssid_filter = 1; @@ -105,10 +105,10 @@ int wfx_hif_set_rx_filter(struct wfx_vif *wvif, } int wfx_hif_set_beacon_filter_table(struct wfx_vif *wvif, int tbl_len, - const struct hif_ie_table_entry *tbl) + const struct wfx_hif_ie_table_entry *tbl) { int ret; - struct hif_mib_bcn_filter_table *arg; + struct wfx_hif_mib_bcn_filter_table *arg; int buf_len = struct_size(arg, ie_table, tbl_len); arg = kzalloc(buf_len, GFP_KERNEL); @@ -125,7 +125,7 @@ int wfx_hif_set_beacon_filter_table(struct wfx_vif *wvif, int tbl_len, int wfx_hif_beacon_filter_control(struct wfx_vif *wvif, int enable, int beacon_count) { - struct hif_mib_bcn_filter_enable arg = { + struct wfx_hif_mib_bcn_filter_enable arg = { .enable = cpu_to_le32(enable), .bcn_count = cpu_to_le32(beacon_count), }; @@ -135,9 +135,9 @@ int wfx_hif_beacon_filter_control(struct wfx_vif *wvif, } int wfx_hif_set_operational_mode(struct wfx_dev *wdev, - enum hif_op_power_mode mode) + enum wfx_hif_op_power_mode mode) { - struct hif_mib_gl_operational_power_mode arg = { + struct wfx_hif_mib_gl_operational_power_mode arg = { .power_mode = mode, .wup_ind_activation = 1, }; @@ -149,11 +149,11 @@ int wfx_hif_set_operational_mode(struct wfx_dev *wdev, int wfx_hif_set_template_frame(struct wfx_vif *wvif, struct sk_buff *skb, u8 frame_type, int init_rate) { - struct hif_mib_template_frame *arg; + struct wfx_hif_mib_template_frame *arg; WARN(skb->len > HIF_API_MAX_TEMPLATE_FRAME_SIZE, "frame is too big"); skb_push(skb, 4); - arg = (struct hif_mib_template_frame *)skb->data; + arg = (struct wfx_hif_mib_template_frame *)skb->data; skb_pull(skb, 4); arg->init_rate = init_rate; arg->frame_type = frame_type; @@ -164,7 +164,7 @@ int wfx_hif_set_template_frame(struct wfx_vif *wvif, struct sk_buff *skb, int wfx_hif_set_mfp(struct wfx_vif *wvif, bool capable, bool required) { - struct hif_mib_protected_mgmt_policy arg = { }; + struct wfx_hif_mib_protected_mgmt_policy arg = { }; WARN(required && !capable, "incoherent arguments"); if (capable) { @@ -181,7 +181,7 @@ int wfx_hif_set_mfp(struct wfx_vif *wvif, bool capable, bool required) int wfx_hif_set_block_ack_policy(struct wfx_vif *wvif, u8 tx_tid_policy, u8 rx_tid_policy) { - struct hif_mib_block_ack_policy arg = { + struct wfx_hif_mib_block_ack_policy arg = { .block_ack_tx_tid_policy = tx_tid_policy, .block_ack_rx_tid_policy = rx_tid_policy, }; @@ -194,7 +194,7 @@ int wfx_hif_set_block_ack_policy(struct wfx_vif *wvif, int wfx_hif_set_association_mode(struct wfx_vif *wvif, int ampdu_density, bool greenfield, bool short_preamble) { - struct hif_mib_set_association_mode arg = { + struct wfx_hif_mib_set_association_mode arg = { .preambtype_use = 1, .mode = 1, .spacing = 1, @@ -211,7 +211,7 @@ int wfx_hif_set_association_mode(struct wfx_vif *wvif, int ampdu_density, int wfx_hif_set_tx_rate_retry_policy(struct wfx_vif *wvif, int policy_index, u8 *rates) { - struct hif_mib_set_tx_rate_retry_policy *arg; + struct wfx_hif_mib_set_tx_rate_retry_policy *arg; size_t size = struct_size(arg, tx_rate_retry_policy, 1); int ret; @@ -236,7 +236,7 @@ int wfx_hif_set_tx_rate_retry_policy(struct wfx_vif *wvif, int wfx_hif_keep_alive_period(struct wfx_vif *wvif, int period) { - struct hif_mib_keep_alive_period arg = { + struct wfx_hif_mib_keep_alive_period arg = { .keep_alive_period = cpu_to_le16(period), }; @@ -247,7 +247,7 @@ int wfx_hif_keep_alive_period(struct wfx_vif *wvif, int period) int wfx_hif_set_arp_ipv4_filter(struct wfx_vif *wvif, int idx, __be32 *addr) { - struct hif_mib_arp_ip_addr_table arg = { + struct wfx_hif_mib_arp_ip_addr_table arg = { .condition_idx = idx, .arp_enable = HIF_ARP_NS_FILTERING_DISABLE, }; @@ -264,7 +264,7 @@ int wfx_hif_set_arp_ipv4_filter(struct wfx_vif *wvif, int idx, __be32 *addr) int wfx_hif_use_multi_tx_conf(struct wfx_dev *wdev, bool enable) { - struct hif_mib_gl_set_multi_msg arg = { + struct wfx_hif_mib_gl_set_multi_msg arg = { .enable_multi_tx_conf = enable, }; @@ -274,7 +274,7 @@ int wfx_hif_use_multi_tx_conf(struct wfx_dev *wdev, bool enable) int wfx_hif_set_uapsd_info(struct wfx_vif *wvif, unsigned long val) { - struct hif_mib_set_uapsd_information arg = { }; + struct wfx_hif_mib_set_uapsd_information arg = { }; if (val & BIT(IEEE80211_AC_VO)) arg.trig_voice = 1; @@ -291,7 +291,7 @@ int wfx_hif_set_uapsd_info(struct wfx_vif *wvif, unsigned long val) int wfx_hif_erp_use_protection(struct wfx_vif *wvif, bool enable) { - struct hif_mib_non_erp_protection arg = { + struct wfx_hif_mib_non_erp_protection arg = { .use_cts_to_self = enable, }; @@ -302,7 +302,7 @@ int wfx_hif_erp_use_protection(struct wfx_vif *wvif, bool enable) int wfx_hif_slot_time(struct wfx_vif *wvif, int val) { - struct hif_mib_slot_time arg = { + struct wfx_hif_mib_slot_time arg = { .slot_time = cpu_to_le32(val), }; @@ -312,7 +312,7 @@ int wfx_hif_slot_time(struct wfx_vif *wvif, int val) int wfx_hif_wep_default_key_id(struct wfx_vif *wvif, int val) { - struct hif_mib_wep_default_key_id arg = { + struct wfx_hif_mib_wep_default_key_id arg = { .wep_default_key_id = val, }; @@ -323,7 +323,7 @@ int wfx_hif_wep_default_key_id(struct wfx_vif *wvif, int val) int wfx_hif_rts_threshold(struct wfx_vif *wvif, int val) { - struct hif_mib_dot11_rts_threshold arg = { + struct wfx_hif_mib_dot11_rts_threshold arg = { .threshold = cpu_to_le32(val >= 0 ? val : 0xFFFF), }; diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h index 9b4c16ad5ecf..e7e556b05c9a 100644 --- a/drivers/staging/wfx/hif_tx_mib.h +++ b/drivers/staging/wfx/hif_tx_mib.h @@ -14,8 +14,8 @@ struct sk_buff; struct wfx_vif; struct wfx_dev; -struct hif_ie_table_entry; -struct hif_mib_extended_count_table; +struct wfx_hif_ie_table_entry; +struct wfx_hif_mib_extended_count_table; int wfx_hif_set_output_power(struct wfx_vif *wvif, int val); int wfx_hif_set_beacon_wakeup_period(struct wfx_vif *wvif, @@ -24,16 +24,16 @@ int wfx_hif_set_beacon_wakeup_period(struct wfx_vif *wvif, int wfx_hif_set_rcpi_rssi_threshold(struct wfx_vif *wvif, int rssi_thold, int rssi_hyst); int wfx_hif_get_counters_table(struct wfx_dev *wdev, int vif_id, - struct hif_mib_extended_count_table *arg); + struct wfx_hif_mib_extended_count_table *arg); int wfx_hif_set_macaddr(struct wfx_vif *wvif, u8 *mac); int wfx_hif_set_rx_filter(struct wfx_vif *wvif, bool filter_bssid, bool fwd_probe_req); int wfx_hif_set_beacon_filter_table(struct wfx_vif *wvif, int tbl_len, - const struct hif_ie_table_entry *tbl); + const struct wfx_hif_ie_table_entry *tbl); int wfx_hif_beacon_filter_control(struct wfx_vif *wvif, int enable, int beacon_count); int wfx_hif_set_operational_mode(struct wfx_dev *wdev, - enum hif_op_power_mode mode); + enum wfx_hif_op_power_mode mode); int wfx_hif_set_template_frame(struct wfx_vif *wvif, struct sk_buff *skb, u8 frame_type, int init_rate); int wfx_hif_set_mfp(struct wfx_vif *wvif, bool capable, bool required); diff --git a/drivers/staging/wfx/key.c b/drivers/staging/wfx/key.c index 6069be161154..dea8238f9916 100644 --- a/drivers/staging/wfx/key.c +++ b/drivers/staging/wfx/key.c @@ -30,7 +30,7 @@ static void wfx_free_key(struct wfx_dev *wdev, int idx) wdev->key_map &= ~BIT(idx); } -static u8 fill_wep_pair(struct hif_wep_pairwise_key *msg, +static u8 fill_wep_pair(struct wfx_hif_wep_pairwise_key *msg, struct ieee80211_key_conf *key, u8 *peer_addr) { WARN(key->keylen > sizeof(msg->key_data), "inconsistent data"); @@ -40,7 +40,7 @@ static u8 fill_wep_pair(struct hif_wep_pairwise_key *msg, return HIF_KEY_TYPE_WEP_PAIRWISE; } -static u8 fill_wep_group(struct hif_wep_group_key *msg, +static u8 fill_wep_group(struct wfx_hif_wep_group_key *msg, struct ieee80211_key_conf *key) { WARN(key->keylen > sizeof(msg->key_data), "inconsistent data"); @@ -50,7 +50,7 @@ static u8 fill_wep_group(struct hif_wep_group_key *msg, return HIF_KEY_TYPE_WEP_DEFAULT; } -static u8 fill_tkip_pair(struct hif_tkip_pairwise_key *msg, +static u8 fill_tkip_pair(struct wfx_hif_tkip_pairwise_key *msg, struct ieee80211_key_conf *key, u8 *peer_addr) { u8 *keybuf = key->key; @@ -67,7 +67,7 @@ static u8 fill_tkip_pair(struct hif_tkip_pairwise_key *msg, return HIF_KEY_TYPE_TKIP_PAIRWISE; } -static u8 fill_tkip_group(struct hif_tkip_group_key *msg, +static u8 fill_tkip_group(struct wfx_hif_tkip_group_key *msg, struct ieee80211_key_conf *key, struct ieee80211_key_seq *seq, enum nl80211_iftype iftype) @@ -92,7 +92,7 @@ static u8 fill_tkip_group(struct hif_tkip_group_key *msg, return HIF_KEY_TYPE_TKIP_GROUP; } -static u8 fill_ccmp_pair(struct hif_aes_pairwise_key *msg, +static u8 fill_ccmp_pair(struct wfx_hif_aes_pairwise_key *msg, struct ieee80211_key_conf *key, u8 *peer_addr) { WARN(key->keylen != sizeof(msg->aes_key_data), "inconsistent data"); @@ -101,7 +101,7 @@ static u8 fill_ccmp_pair(struct hif_aes_pairwise_key *msg, return HIF_KEY_TYPE_AES_PAIRWISE; } -static u8 fill_ccmp_group(struct hif_aes_group_key *msg, +static u8 fill_ccmp_group(struct wfx_hif_aes_group_key *msg, struct ieee80211_key_conf *key, struct ieee80211_key_seq *seq) { @@ -113,7 +113,7 @@ static u8 fill_ccmp_group(struct hif_aes_group_key *msg, return HIF_KEY_TYPE_AES_GROUP; } -static u8 fill_sms4_pair(struct hif_wapi_pairwise_key *msg, +static u8 fill_sms4_pair(struct wfx_hif_wapi_pairwise_key *msg, struct ieee80211_key_conf *key, u8 *peer_addr) { u8 *keybuf = key->key; @@ -128,7 +128,7 @@ static u8 fill_sms4_pair(struct hif_wapi_pairwise_key *msg, return HIF_KEY_TYPE_WAPI_PAIRWISE; } -static u8 fill_sms4_group(struct hif_wapi_group_key *msg, +static u8 fill_sms4_group(struct wfx_hif_wapi_group_key *msg, struct ieee80211_key_conf *key) { u8 *keybuf = key->key; @@ -142,7 +142,7 @@ static u8 fill_sms4_group(struct hif_wapi_group_key *msg, return HIF_KEY_TYPE_WAPI_GROUP; } -static u8 fill_aes_cmac_group(struct hif_igtk_group_key *msg, +static u8 fill_aes_cmac_group(struct wfx_hif_igtk_group_key *msg, struct ieee80211_key_conf *key, struct ieee80211_key_seq *seq) { @@ -158,7 +158,7 @@ static int wfx_add_key(struct wfx_vif *wvif, struct ieee80211_sta *sta, struct ieee80211_key_conf *key) { int ret; - struct hif_req_add_key k = { }; + struct wfx_hif_req_add_key k = { }; struct ieee80211_key_seq seq; struct wfx_dev *wdev = wvif->wdev; int idx = wfx_alloc_key(wvif->wdev); diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index 43947f8f2e0c..f34cfed503d4 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -288,8 +288,8 @@ struct wfx_dev *wfx_init_common(struct device *dev, hw->queues = 4; hw->max_rates = 8; hw->max_rate_tries = 8; - hw->extra_tx_headroom = sizeof(struct hif_msg) - + sizeof(struct hif_req_tx) + hw->extra_tx_headroom = sizeof(struct wfx_hif_msg) + + sizeof(struct wfx_hif_req_tx) + 4 /* alignment */ + 8 /* TKIP IV */; hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC) | diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index 7a3ba3c38925..71c6ef94a904 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -127,13 +127,13 @@ void wfx_pending_drop(struct wfx_dev *wdev, struct sk_buff_head *dropped) { struct wfx_queue *queue; struct wfx_vif *wvif; - struct hif_msg *hif; + struct wfx_hif_msg *hif; struct sk_buff *skb; WARN(!wdev->chip_frozen, "%s should only be used to recover a frozen device", __func__); while ((skb = skb_dequeue(&wdev->tx_pending)) != NULL) { - hif = (struct hif_msg *)skb->data; + hif = (struct wfx_hif_msg *)skb->data; wvif = wdev_to_wvif(wdev, hif->interface); if (wvif) { queue = &wvif->tx_queue[skb_get_queue_mapping(skb)]; @@ -148,15 +148,15 @@ void wfx_pending_drop(struct wfx_dev *wdev, struct sk_buff_head *dropped) struct sk_buff *wfx_pending_get(struct wfx_dev *wdev, u32 packet_id) { struct wfx_queue *queue; - struct hif_req_tx *req; + struct wfx_hif_req_tx *req; struct wfx_vif *wvif; - struct hif_msg *hif; + struct wfx_hif_msg *hif; struct sk_buff *skb; spin_lock_bh(&wdev->tx_pending.lock); skb_queue_walk(&wdev->tx_pending, skb) { - hif = (struct hif_msg *)skb->data; - req = (struct hif_req_tx *)hif->body; + hif = (struct wfx_hif_msg *)skb->data; + req = (struct wfx_hif_req_tx *)hif->body; if (req->packet_id != packet_id) continue; spin_unlock_bh(&wdev->tx_pending.lock); @@ -179,7 +179,7 @@ void wfx_pending_dump_old_frames(struct wfx_dev *wdev, unsigned int limit_ms) { ktime_t now = ktime_get(); struct wfx_tx_priv *tx_priv; - struct hif_req_tx *req; + struct wfx_hif_req_tx *req; struct sk_buff *skb; bool first = true; @@ -236,7 +236,7 @@ static struct sk_buff *wfx_tx_queues_get_skb(struct wfx_dev *wdev) struct wfx_queue *queues[IEEE80211_NUM_ACS * ARRAY_SIZE(wdev->vif)]; int i, j, num_queues = 0; struct wfx_vif *wvif; - struct hif_msg *hif; + struct wfx_hif_msg *hif; struct sk_buff *skb; /* sort the queues */ @@ -265,7 +265,7 @@ static struct sk_buff *wfx_tx_queues_get_skb(struct wfx_dev *wdev) * and only one vif can be AP, all queued frames has * same interface id */ - hif = (struct hif_msg *)skb->data; + hif = (struct wfx_hif_msg *)skb->data; WARN_ON(hif->interface != wvif->id); WARN_ON(queues[i] != &wvif->tx_queue[skb_get_queue_mapping(skb)]); @@ -289,7 +289,7 @@ static struct sk_buff *wfx_tx_queues_get_skb(struct wfx_dev *wdev) return NULL; } -struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev) +struct wfx_hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev) { struct wfx_tx_priv *tx_priv; struct sk_buff *skb; @@ -303,5 +303,5 @@ struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev) wake_up(&wdev->tx_dequeue); tx_priv = wfx_skb_tx_priv(skb); tx_priv->xmit_timestamp = ktime_get(); - return (struct hif_msg *)skb->data; + return (struct wfx_hif_msg *)skb->data; } diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h index edd0d018b198..66596a9abe30 100644 --- a/drivers/staging/wfx/queue.h +++ b/drivers/staging/wfx/queue.h @@ -30,7 +30,7 @@ void wfx_tx_queues_init(struct wfx_vif *wvif); void wfx_tx_queues_check_empty(struct wfx_vif *wvif); bool wfx_tx_queues_has_cab(struct wfx_vif *wvif); void wfx_tx_queues_put(struct wfx_vif *wvif, struct sk_buff *skb); -struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev); +struct wfx_hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev); bool wfx_tx_queue_empty(struct wfx_vif *wvif, struct wfx_queue *queue); void wfx_tx_queue_drop(struct wfx_vif *wvif, struct wfx_queue *queue, diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index d384f2df329c..620d8c912f95 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -63,7 +63,7 @@ void wfx_suspend_hot_dev(struct wfx_dev *wdev, enum sta_notify_cmd cmd) static void wfx_filter_beacon(struct wfx_vif *wvif, bool filter_beacon) { - static const struct hif_ie_table_entry filter_ies[] = { + static const struct wfx_hif_ie_table_entry filter_ies[] = { { .ie_id = WLAN_EID_VENDOR_SPECIFIC, .has_changed = 1, diff --git a/drivers/staging/wfx/traces.h b/drivers/staging/wfx/traces.h index e90dc73c4b01..99bd1808111e 100644 --- a/drivers/staging/wfx/traces.h +++ b/drivers/staging/wfx/traces.h @@ -158,7 +158,7 @@ hif_mib_list_enum #define hif_mib_list hif_mib_list_enum { -1, NULL } DECLARE_EVENT_CLASS(hif_data, - TP_PROTO(const struct hif_msg *hif, int tx_fill_level, bool is_recv), + TP_PROTO(const struct wfx_hif_msg *hif, int tx_fill_level, bool is_recv), TP_ARGS(hif, tx_fill_level, is_recv), TP_STRUCT__entry( __field(int, tx_fill_level) @@ -192,7 +192,7 @@ DECLARE_EVENT_CLASS(hif_data, } __entry->buf_len = min_t(int, __entry->msg_len, sizeof(__entry->buf)) - - sizeof(struct hif_msg) - header_len; + - sizeof(struct wfx_hif_msg) - header_len; memcpy(__entry->buf, hif->body + header_len, __entry->buf_len); ), TP_printk("%d:%d:%s_%s%s%s: %s%s (%d bytes)", @@ -208,12 +208,12 @@ DECLARE_EVENT_CLASS(hif_data, ) ); DEFINE_EVENT(hif_data, hif_send, - TP_PROTO(const struct hif_msg *hif, int tx_fill_level, bool is_recv), + TP_PROTO(const struct wfx_hif_msg *hif, int tx_fill_level, bool is_recv), TP_ARGS(hif, tx_fill_level, is_recv)); #define _trace_hif_send(hif, tx_fill_level)\ trace_hif_send(hif, tx_fill_level, false) DEFINE_EVENT(hif_data, hif_recv, - TP_PROTO(const struct hif_msg *hif, int tx_fill_level, bool is_recv), + TP_PROTO(const struct wfx_hif_msg *hif, int tx_fill_level, bool is_recv), TP_ARGS(hif, tx_fill_level, is_recv)); #define _trace_hif_recv(hif, tx_fill_level)\ trace_hif_recv(hif, tx_fill_level, true) @@ -364,7 +364,7 @@ TRACE_EVENT(bh_stats, trace_bh_stats(ind, req, cnf, busy, release) TRACE_EVENT(tx_stats, - TP_PROTO(const struct hif_cnf_tx *tx_cnf, const struct sk_buff *skb, + TP_PROTO(const struct wfx_hif_cnf_tx *tx_cnf, const struct sk_buff *skb, int delay), TP_ARGS(tx_cnf, skb, delay), TP_STRUCT__entry( diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index f8df59ad1639..1c06430e5996 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -38,7 +38,7 @@ struct wfx_dev { u8 keyset; struct completion firmware_ready; - struct hif_ind_startup hw_caps; + struct wfx_hif_ind_startup hw_caps; struct wfx_hif hif; struct delayed_work cooling_timeout_work; bool poll_irq; @@ -53,9 +53,9 @@ struct wfx_dev { atomic_t packet_id; u32 key_map; - struct hif_rx_stats rx_stats; + struct wfx_hif_rx_stats rx_stats; struct mutex rx_stats_lock; - struct hif_tx_power_loop_info tx_power_loop_info; + struct wfx_hif_tx_power_loop_info tx_power_loop_info; struct mutex tx_power_loop_info_lock; int force_ps_timeout; };