From patchwork Thu Jun 14 10:11:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omer Efrat X-Patchwork-Id: 10463753 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C311603EE for ; Thu, 14 Jun 2018 10:11:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59FAE289BE for ; Thu, 14 Jun 2018 10:11:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C517289CF; Thu, 14 Jun 2018 10:11:25 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 07446289BE for ; Thu, 14 Jun 2018 10:11:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754996AbeFNKLX (ORCPT ); Thu, 14 Jun 2018 06:11:23 -0400 Received: from mail-he1eur01on0105.outbound.protection.outlook.com ([104.47.0.105]:13274 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754986AbeFNKLV (ORCPT ); Thu, 14 Jun 2018 06:11:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tandemg.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Iyk8ATGzh/pfUDnOU7i/j5JL/q6bvRGcZZRmXhjS5aU=; b=y0+K5zS6hZVnnMCeSn9+27LqHhkRurEBOnfE8F+0C5379+YjvxZO2WhEXnIBj6EJ93iKAzdLslbmPjdyJVH1McJ5UhK/fAxgQSnoGNtDihIEwEhs1c2MCihLHPDVmlQRC28EvbX+QG2undwjAMndoupThgiFAIgvn3zzBApAUi0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=omer.efrat@tandemg.com; Received: from omer-laptop.tandemg.local (37.142.120.98) by DB7PR02MB3626.eurprd02.prod.outlook.com (2603:10a6:5:1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.17; Thu, 14 Jun 2018 10:11:17 +0000 From: Omer Efrat To: linux-wireless@vger.kernel.org Cc: Omer Efrat Subject: [PATCH v2 2/5] mac80211: use BIT_ULL for NL80211_STA_INFO_* attribute types Date: Thu, 14 Jun 2018 13:11:13 +0300 Message-Id: <1528971073-349-1-git-send-email-omer.efrat@tandemg.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [37.142.120.98] X-ClientProxiedBy: LO2P265CA0005.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:62::17) To DB7PR02MB3626.eurprd02.prod.outlook.com (2603:10a6:5:1::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7553e79e-0407-4b8b-32bf-08d5d1df2b3b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DB7PR02MB3626; X-Microsoft-Exchange-Diagnostics: 1; DB7PR02MB3626; 3:XccY2WVyAl0yShGwutchUvlHlxe1OfcleBx85c6bu0FzWWMLsWhoeiGCz0TjMTryzIX3St6iPkcqJZ7NKDV+LOFhG3LVewUJpUlhHXIxmY3qghqh6j3GZ2edblkToCXevQPFey5maYSBwGH3gvfP737CJ6azYo6VEva1WbWaSwbZj9SBiEQI3hKBqNRck6LXNak57YeLZILOinhVUCpulM2m5uIg30YIPk0AinTo5o6I3394gYML3lgPsYDWk0Xe; 25:TkNbOUeG7cGvUKilTfn1o6RzB2/oNLLGqtyudmhxca7dmAm30w16bG8MQBm4ErLxqeo3QtEr2Xk6hzid2T/kMmMNBl4yx7/1ARtvnsU/lkki/WQ87TgqFyOhC5NVcVQyyVI7FesO+Cn+LLJ9U/vDqtBKbj3vpg5y6fwA+RWnAI2ZS6I5SgiK26nECp93rMlq6RlhTQvqduURAFAPGVe2NwmNE8LspSBLG6HwbriWTgj3f7IjFokKPqaluMgxr0AzR8V4GO75a7XmPKUxXH/8tMe2aknKNUbwFbmClKkodeLYpgzNGKGj2mqdAQPeIKUvhqW2CyPwB1Oy5dg2D4uBtQ==; 31:J8PYxnZUrlhJnCKBAuhA6knvzrUTs+JtW/LdelaJ9jzN1r3dHDk2XhLkyFLkePMQPYtc77Y9/z/5ttZcXHRJ3/qaF3E289cNZ/gxQeqE5J07xV6cooJ7g9HM/zQboGoy3SNDfyM40OmCRO7hxrtyF4lFmSaH0IzevzsPMeZ4vi7GN9vk7dNXbmohVSQHBd9N471YEB6myMx87yKZfG0KHAT+nBa7AX/gjoxnsosQ2ls= X-MS-TrafficTypeDiagnostic: DB7PR02MB3626: X-Microsoft-Exchange-Diagnostics: 1; DB7PR02MB3626; 20:VFHUsM8oiJ3lyMiL7uIYI5wUHuZXUZw9ojdb4ENeF14P/oD3eXPxYnn+PpGTDp7p0Qe30bSsPaoKjmLQIT5W6/xznRNn47epmJw3STEh2KI2MatMaRkBDda32Tv1if029dccpqBjleMzIH+ueh/tTDlznDbravJ8Vv6aj3M8EkViHL/M8MIOEWWMQCWwHy7my+uHje3m+aXRzfbsX4AuTu0OKCNPq6dKR/IU1uNqZ4Xmam10yFutZ0E9F/z+4SfFDWSTIk4gUAyh2d59Cw728mGUHdY+F/Q+B4ih6nFBJv7tSfcTXCscZ/mwu7m0wID/N0vdbgQ6vgDnXaDczrXRMg==; 4:r2GOimsMu68p1C16T2yHykB3h4g9eoYk5e/F91jpjS8aYLRGA7DqqpJeydxR6/EqrPUEFMASpMrMN/yU3MVd9EZpJ8j0cdIK9g/Ym7fx5yWer7FGzcFmrw+lfrb9HSMfbpFVJGSg7MXoD/7yOHRpvOtjEjc5BHfaP64Wg9NQpiJNhea4Fqw7F5OAWnFzN21Vjzj5i9mg3r8wWV3EFvttztL4HjxMtlmJxJ8AD+wIBJ6qsnNjoOusQ/NdBwX3Ay2JkzNzg0tzDpmZONC4VxD64w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DB7PR02MB3626; BCL:0; PCL:0; RULEID:; SRVR:DB7PR02MB3626; X-Forefront-PRVS: 0703B549E4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39840400004)(39380400002)(376002)(396003)(346002)(366004)(189003)(199004)(66066001)(486006)(47776003)(16586007)(386003)(316002)(6506007)(476003)(2616005)(956004)(15760500003)(26005)(50466002)(48376002)(59450400001)(52116002)(86362001)(36756003)(6666003)(51416003)(44832011)(6916009)(97736004)(2906002)(106356001)(81156014)(81166006)(4326008)(53936002)(2351001)(5660300001)(107886003)(50226002)(25786009)(68736007)(6486002)(186003)(2361001)(3846002)(8936002)(16526019)(6116002)(6512007)(305945005)(8676002)(105586002)(478600001)(7736002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB7PR02MB3626; H:omer-laptop.tandemg.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: tandemg.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB7PR02MB3626; 23:hqGYro3KDxSGNpsFEjBVr9bRAfHQJN1wt/ygzfcJW?= =?us-ascii?Q?q+4X8aM3B/0jywArnTRkk1p3PfVcEV12J6UQb8cARHtG/SiX2rkDcFwh+YLY?= =?us-ascii?Q?6dH9D2T2yntsWlCbT9vK50+wDkf87aiVj8blzBS0ccR0Lxy1KE5mP6JtBFKK?= =?us-ascii?Q?oSWXKkH2LYH70TDSOV8WtUhXeyOdlMoAevA507jetK9NvTQePeb0kmAYvqA0?= =?us-ascii?Q?FHUhwYbeiPfcjMYuP+qTFGMjnYSfC4uJBmZ0JoBiqRZZkhbW+XkYSIKfqn4i?= =?us-ascii?Q?QOGDFk15j44OPOZ8b8ThFBGTEc9Mb5F+tcNWtiGHXat6IvQBBZJGAA1ilRQJ?= =?us-ascii?Q?6EdE10PNi8W0ejulGuUeX2YTyg/tDGQOPJRaKeL8gThBV/OP2JPSUltLCFlO?= =?us-ascii?Q?q+KQuvYFh2HCAEND84u3bO0gYcYNKjYrVB4n6zt6vu0fJpyApoykRjLC3X5x?= =?us-ascii?Q?sQCvhDCVq7nrEgzOHDw69xA8B3rp+HhGUWcNhFfTulTwsyUDIKliHyWJi96b?= =?us-ascii?Q?ZRQT2dp0IaD9q5moRoVbWF/sNUM3Ekm1o6JZVNrLZ6RSWR3ltdN8rwBnlN7t?= =?us-ascii?Q?6v6cAgpzrvd+cOBds2sQiASJxVxJF2qjnw79N3OO2ef5oqr9wv6BR+jHgt81?= =?us-ascii?Q?t3zfIYg1e1Pv5A37T3Zkna2WxY0l7H3YoLOoLqNkE1lXAwYPlOqEbOocxFtm?= =?us-ascii?Q?LxH+poi6Z2ckJcqHF4bEWROj86/RINnnhNwJqxAs71hkAeL3KMoYm0AFTUgK?= =?us-ascii?Q?HKMVPufHh/dc8ZAI5p8KL7f0bwxuAEwhUSdXmh6nfHy2HZAyFqhSDyX3bYFA?= =?us-ascii?Q?sDOyWvonA4W4X5MAtUj2us0PBZSRfIDj/Y/etbmaiAxTPpE82mQTQY11FJC9?= =?us-ascii?Q?kHNOA3HHaU1EJiPu8gh2RGY9sp9+yaKfZuAi1RiFsUQr1hJD0PGLP/dMvgkU?= =?us-ascii?Q?Y1Gd4jTzO6k1PBqZXc/sikbHZ0a6+4y2BGedbL4VZziT7dhYu3b9fjKpQD1N?= =?us-ascii?Q?isCmPoTwEDfHQZeKCXXE5guDEe9gHicCscjfE8ytTYG54dbDP1YIXas4lHn0?= =?us-ascii?Q?mAP5XbhRm2eTd2cZFVhY18SDKkxGAv4vKfcd490TaooOwIIGdomuooupybdV?= =?us-ascii?Q?Wlb3Gl9cE2M97VDHRp8L0YLFJhpYcepCI1evO3O8uX5h4fF2WpC2+yk0IVNO?= =?us-ascii?Q?R9SKSFcCCmSd2BzHenRd+1jCcTCkmxU71hDKGV2HIPTieX6Uz500EXdPFeou?= =?us-ascii?Q?qb2JC520F3Fxa96eTY=3D?= X-Microsoft-Antispam-Message-Info: JKDOWbq4IoJ9hUTCsHtO17/eh428CJlogT6rOe2O0/DT9GBF1ekWOwQ66CIwCBrC/O9f8Y5Jvs/LggkvICZigNBJhsb8Fb3ezOIL7nEOB0JJsv148ohMX2gb2P47pX6W7BH3Wr4bM/p0iJJTDKuvcakyDvdV282ktpyE89XlBjkgpj/PJIxIomvIyNZsxE57 X-Microsoft-Exchange-Diagnostics: 1; DB7PR02MB3626; 6:E8jrP+mB3L7R0mIE9FNJXP9euB0yOl3y8QGXPePykQmu9Djyipj2BQxoZzRRusqJ6wTbVFYdtLJ9l2Fx1OlHbCiFyE2rLwxoscxilOwpqPZhV4L9QKOGDU/RmIRBBoTRkJTmRPHeN+p+HuGE85a/aQY8g27bsoC/rUjHThpkk3fRvuSyUY6FUIwG1LwQn5rHcIAyOckZqo1wyH3DXz6bOlWhTfe8NbF+Gjjir4UbBvDf43nFZD/ypNpF3AN9XAjLQ/Afg9X6Xf19RFcndsgZtlDe7vByB7AsBS97wtLvsVJB+RbdfLLfibIsbzIcuKBc9Q0Lbhq1CFCxV0x4DR1UHDji6XY6J2lAO4ZA75W+MAQeZcDpiXC6T91EtW5abeozjxNoD/u0wWBugx0V+npbLuHEe5dZ/gLjsZUalVupvb/AQddvCp7kdZ4zXiY0OXoSutjHCZGFV5kC1LHTBcz9MQ==; 5:4jXxqhxEHJJxH//sQzzLcwT//Q23QsEbTSBWnA0O6oSvTpvTfD/QXPp8WByl16RtEnLFSyxoW7MmlS5rLag898Qc0cXKVvyJ1jxJGbTGwIdAZvshAT0Ze1Ko1oyeXzy5t7zDWpkWgCdByOr4A9sHdT4Giej1G38hXM0C8PieIlE=; 24:pChvsmFRD2LwwPwfhNGq3ix7l2GDJCO1EsWYtT3cjUQo5ugbWWVOYoH73lpuZ+Xilf3ZAubAtl6vdMWWXtNALgEMgBEtHgN3P5iFlfZNMFc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR02MB3626; 7:sLHOZ5fLb4PHzI8ptzPKOV+K3MYbAAVRfcCm1BkloGZhUk+Cfd1zBijNxgA3V6gVnyn8CVPd9JqBcdRPrfmnnm5Gnf3v2IzeeMWh23ppvjBMJsI3J5c8LUpH8L8w99HKWM7ZIe+uo0iSOsdimEm0aFYVBoYNopkdcL3l4FZSwzPPj6262xDzqLiNYbLuPqBWUlPteFjmhqvNq6xXytMMBpT+pQo19LMPIlk0QhwKJSKB7DAxxrj348RttyM7Gbyk X-OriginatorOrg: tandemg.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2018 10:11:17.2642 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7553e79e-0407-4b8b-32bf-08d5d1df2b3b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d690b55a-f04a-454b-9f62-fb1e25467a25 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR02MB3626 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 Since 'filled' member in station_info changed to u64, BIT_ULL macro should be used with NL80211_STA_INFO_* attribute types instead of BIT. The BIT macro uses unsigned long type which some architectures handle as 32bit and this results in compilation warnings such as: net/mac80211/sta_info.c:2223:2: warning: left shift count >= width of type sinfo->filled |= BIT(NL80211_STA_INFO_TID_STATS); ^ Signed-off-by: Omer Efrat --- net/mac80211/ethtool.c | 6 ++-- net/mac80211/sta_info.c | 84 ++++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c index 690c142..5ac7438 100644 --- a/net/mac80211/ethtool.c +++ b/net/mac80211/ethtool.c @@ -116,16 +116,16 @@ static void ieee80211_get_stats(struct net_device *dev, data[i++] = sta->sta_state; - if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)) + if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) data[i] = 100000ULL * cfg80211_calculate_bitrate(&sinfo.txrate); i++; - if (sinfo.filled & BIT(NL80211_STA_INFO_RX_BITRATE)) + if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE)) data[i] = 100000ULL * cfg80211_calculate_bitrate(&sinfo.rxrate); i++; - if (sinfo.filled & BIT(NL80211_STA_INFO_SIGNAL_AVG)) + if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG)) data[i] = (u8)sinfo.signal_avg; i++; } else { diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 6428f1a..656a838 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2101,38 +2101,38 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, drv_sta_statistics(local, sdata, &sta->sta, sinfo); - sinfo->filled |= BIT(NL80211_STA_INFO_INACTIVE_TIME) | - BIT(NL80211_STA_INFO_STA_FLAGS) | - BIT(NL80211_STA_INFO_BSS_PARAM) | - BIT(NL80211_STA_INFO_CONNECTED_TIME) | - BIT(NL80211_STA_INFO_RX_DROP_MISC); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME) | + BIT_ULL(NL80211_STA_INFO_STA_FLAGS) | + BIT_ULL(NL80211_STA_INFO_BSS_PARAM) | + BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME) | + BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC); if (sdata->vif.type == NL80211_IFTYPE_STATION) { sinfo->beacon_loss_count = sdata->u.mgd.beacon_loss_count; - sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_LOSS); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_LOSS); } sinfo->connected_time = ktime_get_seconds() - sta->last_connected; sinfo->inactive_time = jiffies_to_msecs(jiffies - ieee80211_sta_last_active(sta)); - if (!(sinfo->filled & (BIT(NL80211_STA_INFO_TX_BYTES64) | - BIT(NL80211_STA_INFO_TX_BYTES)))) { + if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_TX_BYTES64) | + BIT_ULL(NL80211_STA_INFO_TX_BYTES)))) { sinfo->tx_bytes = 0; for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) sinfo->tx_bytes += sta->tx_stats.bytes[ac]; - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64); } - if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_PACKETS))) { + if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_PACKETS))) { sinfo->tx_packets = 0; for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) sinfo->tx_packets += sta->tx_stats.packets[ac]; - sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS); } - if (!(sinfo->filled & (BIT(NL80211_STA_INFO_RX_BYTES64) | - BIT(NL80211_STA_INFO_RX_BYTES)))) { + if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES64) | + BIT_ULL(NL80211_STA_INFO_RX_BYTES)))) { sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats); if (sta->pcpu_rx_stats) { @@ -2144,10 +2144,10 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, } } - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES64); } - if (!(sinfo->filled & BIT(NL80211_STA_INFO_RX_PACKETS))) { + if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_PACKETS))) { sinfo->rx_packets = sta->rx_stats.packets; if (sta->pcpu_rx_stats) { for_each_possible_cpu(cpu) { @@ -2157,17 +2157,17 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, sinfo->rx_packets += cpurxs->packets; } } - sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS); } - if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_RETRIES))) { + if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_RETRIES))) { sinfo->tx_retries = sta->status_stats.retry_count; - sinfo->filled |= BIT(NL80211_STA_INFO_TX_RETRIES); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES); } - if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_FAILED))) { + if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_FAILED))) { sinfo->tx_failed = sta->status_stats.retry_failed; - sinfo->filled |= BIT(NL80211_STA_INFO_TX_FAILED); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED); } sinfo->rx_dropped_misc = sta->rx_stats.dropped; @@ -2182,23 +2182,23 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, if (sdata->vif.type == NL80211_IFTYPE_STATION && !(sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)) { - sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_RX) | - BIT(NL80211_STA_INFO_BEACON_SIGNAL_AVG); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX) | + BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG); sinfo->rx_beacon_signal_avg = ieee80211_ave_rssi(&sdata->vif); } if (ieee80211_hw_check(&sta->local->hw, SIGNAL_DBM) || ieee80211_hw_check(&sta->local->hw, SIGNAL_UNSPEC)) { - if (!(sinfo->filled & BIT(NL80211_STA_INFO_SIGNAL))) { + if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_SIGNAL))) { sinfo->signal = (s8)last_rxstats->last_signal; - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); } if (!sta->pcpu_rx_stats && - !(sinfo->filled & BIT(NL80211_STA_INFO_SIGNAL_AVG))) { + !(sinfo->filled & BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG))) { sinfo->signal_avg = -ewma_signal_read(&sta->rx_stats_avg.signal); - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); } } @@ -2207,11 +2207,11 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, * pcpu statistics */ if (last_rxstats->chains && - !(sinfo->filled & (BIT(NL80211_STA_INFO_CHAIN_SIGNAL) | - BIT(NL80211_STA_INFO_CHAIN_SIGNAL_AVG)))) { - sinfo->filled |= BIT(NL80211_STA_INFO_CHAIN_SIGNAL); + !(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL) | + BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL_AVG)))) { + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL); if (!sta->pcpu_rx_stats) - sinfo->filled |= BIT(NL80211_STA_INFO_CHAIN_SIGNAL_AVG); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL_AVG); sinfo->chains = last_rxstats->chains; @@ -2223,15 +2223,15 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, } } - if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_BITRATE))) { + if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE))) { sta_set_rate_info_tx(sta, &sta->tx_stats.last_rate, &sinfo->txrate); - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); } - if (!(sinfo->filled & BIT(NL80211_STA_INFO_RX_BITRATE))) { + if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE))) { if (sta_set_rate_info_rx(sta, &sinfo->rxrate) == 0) - sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE); } if (tidstats && !cfg80211_sinfo_alloc_tid_stats(sinfo, GFP_KERNEL)) { @@ -2244,18 +2244,18 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, if (ieee80211_vif_is_mesh(&sdata->vif)) { #ifdef CONFIG_MAC80211_MESH - sinfo->filled |= BIT(NL80211_STA_INFO_LLID) | - BIT(NL80211_STA_INFO_PLID) | - BIT(NL80211_STA_INFO_PLINK_STATE) | - BIT(NL80211_STA_INFO_LOCAL_PM) | - BIT(NL80211_STA_INFO_PEER_PM) | - BIT(NL80211_STA_INFO_NONPEER_PM); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_LLID) | + BIT_ULL(NL80211_STA_INFO_PLID) | + BIT_ULL(NL80211_STA_INFO_PLINK_STATE) | + BIT_ULL(NL80211_STA_INFO_LOCAL_PM) | + BIT_ULL(NL80211_STA_INFO_PEER_PM) | + BIT_ULL(NL80211_STA_INFO_NONPEER_PM); sinfo->llid = sta->mesh->llid; sinfo->plid = sta->mesh->plid; sinfo->plink_state = sta->mesh->plink_state; if (test_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN)) { - sinfo->filled |= BIT(NL80211_STA_INFO_T_OFFSET); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_T_OFFSET); sinfo->t_offset = sta->mesh->t_offset; } sinfo->local_pm = sta->mesh->local_pm; @@ -2300,7 +2300,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, thr = sta_get_expected_throughput(sta); if (thr != 0) { - sinfo->filled |= BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_EXPECTED_THROUGHPUT); sinfo->expected_throughput = thr; }