From patchwork Thu Jun 14 10:13:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omer Efrat X-Patchwork-Id: 10463759 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 596CA603B4 for ; Thu, 14 Jun 2018 10:13:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 494AD289D1 for ; Thu, 14 Jun 2018 10:13:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DBBC289D3; Thu, 14 Jun 2018 10:13:47 +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 AFB34289D1 for ; Thu, 14 Jun 2018 10:13:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754923AbeFNKNp (ORCPT ); Thu, 14 Jun 2018 06:13:45 -0400 Received: from mail-eopbgr10098.outbound.protection.outlook.com ([40.107.1.98]:22688 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754764AbeFNKNn (ORCPT ); Thu, 14 Jun 2018 06:13:43 -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=9lrGF+mgCBo6L91R30rdnvc+VZ7VbuFm9Q8A+Y/U7zI=; b=Px9iSNPBi5G7KlfW0yA4uH2PA3jZdASESTwa7bJ+pjn1hQB0KSJ7+ZHBORUYsBvdrcBzvvqaXpmfbH1S0vQ6n30cVGN1YZ4JfZN4VGvP9XgMbqcNZECICsp1oTLlk/OOVPBV0ays59hyL6gEOXyEp+lQ3sZv0zfmfTLeM9Y1jrY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=omer.efrat@tandemg.com; Received: from omer-laptop.tandemg.local (37.142.120.98) by AM6PR02MB3621.eurprd02.prod.outlook.com (2603:10a6:209:2b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.14; Thu, 14 Jun 2018 10:13:40 +0000 From: Omer Efrat To: linux-wireless@vger.kernel.org Cc: devel@driverdev.osuosl.org, Omer Efrat Subject: [PATCH v2 5/5] staging: use BIT_ULL for NL80211_STA_INFO_* attribute types Date: Thu, 14 Jun 2018 13:13:37 +0300 Message-Id: <1528971217-566-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: AM5PR0701CA0020.eurprd07.prod.outlook.com (2603:10a6:203:51::30) To AM6PR02MB3621.eurprd02.prod.outlook.com (2603:10a6:209:2b::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6de994a-26a7-43d6-269f-08d5d1df80ca X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR02MB3621; X-Microsoft-Exchange-Diagnostics: 1; AM6PR02MB3621; 3:bOYkyhM4cXBqIsY0flOKpP6XJCO1ooLLDIuOPo+1+lG9eW6NsrM4s/2X9qg7PUZadwVT9gcMnXcIGM9KDW9yur7Gz3H9pSq9jZCumyHTnEiDSOBJsh5GQYQzEBOmp4O7EkSjUarTThmyacc8l2jxh9J+lTyIWxJ3LWhe3NklvFoKAUfEZmHi6nezGCpkszNKX4SSIcp9ZopTdtIM4xTiwLYvvpIqC7yENHSAP+gGUZZvhSNEo16cmlYA7HtMCqQN; 25:lMhAYzO4cue+ciEmUFA1a8BDNEmIUH4dhhAO1hyPDq6F0SdKp9uQgMHs8LhgL1tLd1sBjx/w/t9PHb55WUOkGMfcIqNz4YjnN7AmhqlrC8B7cYNzdT4ElhzibPtSaS9rKNEFrv64SZKCzB0XdxRrs3V/bBNpKULr/hWR+gBY2Y9Bnx8mz6DUcXXego8R1obBTdnlFgfsorV0TKP83y/deHTIORfkAx9OeoMLqaSG0W7NeGOFW7sPAS4+US1by+OcN0XhpYLUG00wzxt35gCUBwGokSRI+/6zD5e2pP4Uc2pdq5UmJNs+NzCSu0VwmEaULaxmGPL+ZfcVByUBOS3vhQ==; 31:vHDKV72vs9kNe3i+CE0icEJmJfIw8K+uxZVsTRzxm1u9IbnEw2SAH9xs/8ChYORhcHO21eKWEc0AgBdFOYUNi9XhtTKTHVbFCASRaahfYrvQXk4r30KnzP/5YLhgDsD4leWuVHq4mHuNgQKFH8Njgfa7Mvxl5XsPG87Qrgbpr1bcaJxrtWnaCP/QA1rXX08Ng0x/tm+sMJVvrNPp0W8v2Ik2GtC3V+R6CDs/qkixKps= X-MS-TrafficTypeDiagnostic: AM6PR02MB3621: X-Microsoft-Exchange-Diagnostics: 1; AM6PR02MB3621; 20:iHxn8Jhl/+4zQ4ALxISMs//XTWaMS2SxWvZ3L/ZLhXhyAHWnTN0POtsPep3IlxbXQjuN0jo9U+6LwywkIJrV5OvwUrjO4ctaX+cbJ6PCq2zzLfLvJUZK5vwS3fWMrMtVUCIFCZcqhabxnJA7vGH8IW/PcWQbFhr8hhNgylI4TorfrGpPegJG6SvH4lt4NRRgulnXfVRLjeBHc3MHQ99D25bCtvwUwIsCZy/LJ08DKNaSvRyIQKDt1As/IXdowB/noVlMIVBhlg5XUd24kdTPo/j9Gj8PJCkeibDJSxhIQx95aQs+Pks/9QBxHFvpYodaZEtdXweU5BTbMIxLKXB2pw==; 4:8R6DAVGtg/id/dsI7l7ssjqeLoe+NkqLnOY9cJUtt6FZWSwVzIHYGwg7bSrbsm1+AzMy+7B1b1A630HqwUb+XI3Qmw5X76OVyFeuSfP4HHyd1y7jm9RKAdKt+yrnkR1ca7pirIVTZ1jYTdobmFfkMCGP0ZrLUhemO5C3poVEGV62BXZ18q1QjoIaJCzuyZts4X/2ovqlriP/7HpaLnNiC8ZPsQLzs6Q2+apk3G66TaBI6+/QeMHSCmAJW5PLOhWWwKpW4XEHWnWLPWfTz0Ge0A== 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)(3002001)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM6PR02MB3621; BCL:0; PCL:0; RULEID:; SRVR:AM6PR02MB3621; X-Forefront-PRVS: 0703B549E4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39830400003)(396003)(376002)(366004)(39380400002)(189003)(199004)(51416003)(105586002)(52116002)(316002)(2361001)(106356001)(476003)(6506007)(16586007)(386003)(59450400001)(2616005)(66066001)(8936002)(8676002)(6116002)(3846002)(44832011)(305945005)(26005)(486006)(956004)(81166006)(81156014)(86362001)(15760500003)(575784001)(50226002)(47776003)(107886003)(6916009)(53936002)(25786009)(6486002)(48376002)(6666003)(478600001)(5660300001)(4326008)(186003)(6512007)(68736007)(16526019)(36756003)(2906002)(97736004)(7736002)(2351001)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR02MB3621; 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; AM6PR02MB3621; 23:yqAAXFvPmoiyhkmVUSrMCnw5RYFd4B+c40RJm4mri?= =?us-ascii?Q?etrLsoGdrwl1X0V7bCTL8GPusN2hhytQnnzglDX48T5M23Gd5WmYcSZPnGu2?= =?us-ascii?Q?90RFOEk6v0Nn9VkHPHX2TDkKvkqTYTVo5shskobpxAZiHE246ourorDk4EDe?= =?us-ascii?Q?WiWdI89gPm/hnR+8365/O6gdPVRTpmdH5SWp9tZE5mQYb2y0kbQ/fjRhXG0Y?= =?us-ascii?Q?mhXAAQoRnybYTFtUHqIZHH/2SWS9DkeuvmctIe1v1BWzUVQnREwwLO2gxy0V?= =?us-ascii?Q?9qv2Vnp/Qou8RC9xIRibcnERaq0Yzh0er06tq8cqnUGDWNzqjtzl+CVzrcQX?= =?us-ascii?Q?/UJouYEvsnG2TbA6zPxLqsk845f0NItx85xIl2E5h2gM48BgKUw6nw+W8jbI?= =?us-ascii?Q?q/yc4xCfofyYpOWvTDr/uDs3uYNiAEy6/da2stPYbse7Kn2tGh0IY+j6/W6l?= =?us-ascii?Q?emG656xhlgnP9iUat9D5H2zpAji7IO5vJTYW1OPAmoT1Q9zXF3GJmu4K6z+z?= =?us-ascii?Q?HOVfbk6oy2acrwWKFUeK3WoSk5bG/Zt3/8lMFE1MlU7BRZLo9+cOlSiL9zKt?= =?us-ascii?Q?8ytQvrnbE3fk/eclallYdTk/q3elHhqksUOJ9RoBtIu1mteuo29MeccUx8mp?= =?us-ascii?Q?dGd123UVW9bBNt74a6DR/Rk2ofoinGYP4cAagZEp6oR5+am5SJ9JsXbtWxFu?= =?us-ascii?Q?F0CBFdvu5o6szYBMFXvoyl/eh9pWKkPLSPIiGDjNQGwuC9OovjQ8U3fFKTMI?= =?us-ascii?Q?3jh8Cp/6MyXAZZrk+0f0Fha7klr4yR7rrHbLiQtmlM+XMT0xmlnTvZeYcls+?= =?us-ascii?Q?QTsRGzLT3GMenAcRra8e68TVplek2t2iz//Nfz+5N2QZFu76k7asndM2898/?= =?us-ascii?Q?zYXMsIZMFdCB05Vey6dAIV0SVUfe+cKoWQhowHM91qHvjh9/LD/v+nlUMyzq?= =?us-ascii?Q?vlZQybKlI1IFkwHh+vw3wmBjCMthm/E1uTGiU/ViJ95nsflVl+179wouD2Ix?= =?us-ascii?Q?MF9ZvB9d/YPzDibghUlRK2gg9vMYAsz8cTW7ZadVPs6NL0uNoaYvedQup0Dm?= =?us-ascii?Q?oHPhrkP7CfDGL55rdTJNdYZZx7WGQMN7I+DyQoc2rKcUJuPszKbuB3mf1cd3?= =?us-ascii?Q?RjqgcTxzV216lvtw3Si3nSTH8GblT6Qs3KF9keTWVRi7dbj3IlIJsHW+FNxa?= =?us-ascii?Q?3pnRm91D6PWnuRWO3RV4fr5wcfnW16IZx/L2ViAUTjHYru7VRiDo1mSi13IU?= =?us-ascii?Q?B2EYHmgKzN8chPoGGB/vpAkPOuiisSkM6QfJXvr?= X-Microsoft-Antispam-Message-Info: p7tCZb1FHJydFXnagawMG/fV4yOf314Ip+4WcP3Ne/d4bfM1JWNFVyIutc6aD9+rjWJS0vqtqDjt/v9KFwzzOeJPrmEI0J02IRTNsEncuezwdGd9ZPmxLM+oHgNWnDCaOVWytaKKJnhUryf+LtBrBRsY2Xn5pxyOHn2coqhl5ShyA7Z18LARY/e63AO+pC/T X-Microsoft-Exchange-Diagnostics: 1; AM6PR02MB3621; 6:xVwAYVOuDnEEEfq7Yygdb+O2EWMDVjNcwuGs9R+GYfrKbqm1rXmoYzhik3451NI1MBUOaBGW1KcFL9qTglPQhgJggcEXxJ9mf2M7RTlPLXYjfdqNCXPmBWmOJEyIj6NjZk/GNzHKCXcYtX7JbsunT1/pei8dR1Pi6auicfLCfYSd+oweRhwBXqqOMdbnhna+5Ed9Pkuv1kwfUrH2m9sAiXMSMC4yOQ+zz1awPgFF5oIrQDTrjyf1tBa7hhaMEagvhAuAvD6WxfUSPr5uvU8W2PYaY2GCYfgywbu8VKLq58DeuO2zzVT3VUoFtZdfHJEEkODQTGhnxoSDrYnNRbtpeVHapUc54CHhmk8KyN2oaKZldgOAtHEX9HZZscW9nbET1N3OLcBc1JCpZIYtKhSH5OkV6yq7/h611mIX+ynWBKJG0x9aN+8y73RZ9MGvZ1EGPXKxlyhciYiPR4Lo5wCE7w==; 5:cIvVFZ5HWpapQlbYAN+uzu9B7vQqGdvQ0Msjj7BT/uGih1ooPPUKJnUYhcLM24yuWMiWounBwGSow+8R+5L+t+Ws0a563NOPnB2w8wFn82OvfJ+RjlakcMTwknpuW1za2pFEP9NhEE/tqdPdo7LEVkOUC4ZyBStZD7y8K0K/KAU=; 24:2hEyu8i4/KA2d9F76c76vZSS+2+AXdQR+f5eZqZkbzoMwBp7b3GgLaJHURv3T2mRq0BtKdk5RxZgTS2Yy1qyCVGTW+R8qOjvilUy7hxneXs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR02MB3621; 7:sHiBZLWMdS/0g72SNXX9XJbBKPcUk7PtmNoRVYIrgSzlH6qqjIwbdRMIe7EGxd4cntlvB926bgDkzCXyy7Q+pl8xbB8J06wroIqoJ2TIBaBtOcjbhLKnccEGRV+6ajnCr6wtEFIIFZ07KiFD3MEGjtzd9fiTZ3G+bVtANBbt7jQPYIr7CJleoThn9/bxEERtET/7/Eu5O5hble6rX/zj0tdHDVI+xqLNBJGXWf7T3cZ0TnPXXCHRHGdHTYtZKqQS X-OriginatorOrg: tandemg.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2018 10:13:40.7687 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6de994a-26a7-43d6-269f-08d5d1df80ca X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d690b55a-f04a-454b-9f62-fb1e25467a25 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR02MB3621 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 --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 10 +++++----- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++------- drivers/staging/wlan-ng/cfg80211.c | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index 46bc2e5..d0c5dbd 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1281,16 +1281,16 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, goto exit; } - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); sinfo->signal = translate_percentage_to_dbm(padapter->recvpriv.signal_strength); - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); sinfo->txrate.legacy = rtw_get_cur_max_rate(padapter); - sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS); sinfo->rx_packets = sta_rx_data_pkts(psta); - sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS); sinfo->tx_packets = psta->sta_stats.tx_pkts; } @@ -3021,7 +3021,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *nde goto exit; } memcpy(mac, psta->hwaddr, ETH_ALEN); - sinfo->filled = BIT(NL80211_STA_INFO_SIGNAL); + sinfo->filled = BIT_ULL(NL80211_STA_INFO_SIGNAL); sinfo->signal = psta->rssi; exit: diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 730d64f..830b48c 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -1184,7 +1184,7 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev, return -ENOENT; } - sinfo->filled |= BIT(NL80211_STA_INFO_INACTIVE_TIME); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME); wilc_get_inactive_time(vif, mac, &inactive_time); sinfo->inactive_time = 1000 * inactive_time; @@ -1195,11 +1195,11 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev, wilc_get_statistics(vif, &stats); - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL) | - BIT(NL80211_STA_INFO_RX_PACKETS) | - BIT(NL80211_STA_INFO_TX_PACKETS) | - BIT(NL80211_STA_INFO_TX_FAILED) | - BIT(NL80211_STA_INFO_TX_BITRATE); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL) | + BIT_ULL(NL80211_STA_INFO_RX_PACKETS) | + BIT_ULL(NL80211_STA_INFO_TX_PACKETS) | + BIT_ULL(NL80211_STA_INFO_TX_FAILED) | + BIT_ULL(NL80211_STA_INFO_TX_BITRATE); sinfo->signal = stats.rssi; sinfo->rx_packets = stats.rx_cnt; @@ -1776,7 +1776,7 @@ static int dump_station(struct wiphy *wiphy, struct net_device *dev, priv = wiphy_priv(wiphy); vif = netdev_priv(priv->dev); - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); wilc_get_rssi(vif, &sinfo->signal); diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index 4291225..07c52e3 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -282,9 +282,9 @@ static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, if (result == 0) { sinfo->txrate.legacy = quality.txrate.data; - sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); sinfo->signal = quality.level.data; - sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); } return result;