From patchwork Wed Jun 6 08:27:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omer Efrat X-Patchwork-Id: 10449831 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 7EC8B60146 for ; Wed, 6 Jun 2018 08:27:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6ECB3296E4 for ; Wed, 6 Jun 2018 08:27:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6302029712; Wed, 6 Jun 2018 08:27:19 +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 DCFBB296E4 for ; Wed, 6 Jun 2018 08:27:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932596AbeFFI1R (ORCPT ); Wed, 6 Jun 2018 04:27:17 -0400 Received: from mail-eopbgr20124.outbound.protection.outlook.com ([40.107.2.124]:55648 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932509AbeFFI1O (ORCPT ); Wed, 6 Jun 2018 04:27:14 -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=emsqnZU6EFKitNkDgHYIzhNY/zaKxHqZUGM/sPpOHmQ=; b=vAMwL8JuYpVTlJYhS3NNMd7cZBT8fJ7V94/vKo16YFDhT5Pb8V9WIklo/BChWwycOZRuZNpnStu5QX66/D5ll7oEMYcQppcTOGqg+uM7tIhv0tyOOUbbvE0qF0CEFfng+jKvluiGY5z5pnRhLbQYuqMBMZXpL7qlArR0EuyZwRE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=omer.efrat@tandemg.com; Received: from omer-laptop.tandemg.local (37.142.120.98) by VI1PR02MB3631.eurprd02.prod.outlook.com (2603:10a6:803:32::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.15; Wed, 6 Jun 2018 08:27:07 +0000 From: Omer Efrat To: linux-wireless@vger.kernel.org Cc: Omer Efrat Subject: [PATCH 3/3] staging: use BIT_ULL for NL80211_STA_INFO_* attribute types Date: Wed, 6 Jun 2018 11:27:01 +0300 Message-Id: <1528273621-28116-3-git-send-email-omer.efrat@tandemg.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528273621-28116-1-git-send-email-omer.efrat@tandemg.com> References: <1528273621-28116-1-git-send-email-omer.efrat@tandemg.com> MIME-Version: 1.0 X-Originating-IP: [37.142.120.98] X-ClientProxiedBy: AM6PR0402CA0014.eurprd04.prod.outlook.com (2603:10a6:209::27) To VI1PR02MB3631.eurprd02.prod.outlook.com (2603:10a6:803:32::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR02MB3631; X-Microsoft-Exchange-Diagnostics: 1; VI1PR02MB3631; 3:zj2lLJB9AlQxHvz936ePPkaAdG106ne0b/SkOW9R4iH20IsSlRyalBP0yJdtaSruCHZfGA/u+79W0+M+fEDuQInmF6yUkYSmCZc1qY2m5pyfXn0nNOfXgnyYyaNIeEEpsp5SQbzN2bsJv6dZ76NfhTnII3+wMCz7gexm6JQKxQmMA+PF8dvYYbX39563BX2RE2V/liXhe9RWsd9irf9B7zuHfNmAKmTbYwRd1wD/trveXL2uhghUN4+ZErYkSiGg; 25:uVSD5yQPBasA7Q+g/qGvbdLdRct+wn9S8PJRkjZ6xcaRJh9Ve7NoxSnUZM9hyTQ6ZrCrL0m6sSJ4Cer2u44zEO/Mf7oDPU2bcnWBkmxFop/gcHWtnU4zES0A+aQE1WSTUkE2LP/ojI1+uF4dufcJGGZKbSV9e+woscqfrjc/d6V5vXJCZuiCgb4TH+vn8q2kQNYv7hk+goyykxmH4KbBgiCNd+EfvbD9sdCqL1gauUXlnHymPcqFin/dTvX30CT1/fRcRcDApkh86yV1vUA1XFbHyHsbS6/pr24EaKx29t4xcYGZPSp/Yx4wjaqNKVOl8A3eRLQRBv+ykqKCSFxr8A==; 31:8YW009JpBfbD8CxYdEK3ybvp4EdySEHe+j04FDFHT7/Ex9ebi1H0TvDO0Wc6VVtw9LQiU150W++dGYQdQrI1If+2GLREH/6HD4kt3bhpt+b5RIDFfW0L5gLyTM8trXOuaz9fqS+jCPYgnuczvXoy4eEbSiQwZWYj7vvhxBeHsa44+frgzSFBNZ1X785Yr7nCjbdSjqxdmuqVoq+D3eS6qeAXpg0cyGB4OY7YyUvIjWQ= X-MS-TrafficTypeDiagnostic: VI1PR02MB3631: X-Microsoft-Exchange-Diagnostics: 1; VI1PR02MB3631; 20:0vYaW/ziAVMI3vgvcXcoE+LIzPOchSzhr8/TT48j9ph7ZFL9DKLXy72eM6At1YjIvYR5XLDGCQrZDdH7NV5OPCC6v4uSp5NI+KGvvVQH2bDj1MIRYOABFgUMpN0IiAMzoNShBcRhGP3RHuFGE8tzS6roEtZbvn+58RanRgvWKkP25zZlQ3tK8uuKPAuHaszqkraZpIZuI/ZxSBhP0D76697ZQ5MySYIvI1h2OXhujYBTLrztiSDRBXctVTS8YdzA; 4:xxYFpwWFH0yTmfO9epmNSID5b9lTGry41qb3OnSExQOwsnUR8hGkg0L0Vr17WqE7+8a4+zae3/T7SyU3GmgTA9CFf0MQtiSfccqj6e1BVIF6v8vONUW+AwstOO/esq5eAoR4WjjAc5b8GXVfSsak3YWJKCTlZWewH+Sndu1LqnzCDvs7T8CE5bhZOG1+33U8TJS2TNZ7+K9gLsPCjxmBurFrU/1DBCyn1dR/qASeXz1X0zDgt2i8cwfMYdJIKY4+L3sSNloB9JdeVWB6TIsuTw== 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)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR02MB3631; BCL:0; PCL:0; RULEID:; SRVR:VI1PR02MB3631; X-Forefront-PRVS: 06952FC175 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(366004)(39830400003)(396003)(346002)(39380400002)(376002)(189003)(199004)(53936002)(8676002)(6512007)(47776003)(25786009)(66066001)(575784001)(68736007)(81166006)(81156014)(15760500003)(476003)(2616005)(11346002)(2906002)(76176011)(52116002)(186003)(16526019)(8936002)(86362001)(16586007)(44832011)(956004)(59450400001)(26005)(50226002)(51416003)(486006)(446003)(7736002)(36756003)(106356001)(105586002)(305945005)(50466002)(2361001)(2351001)(6506007)(386003)(48376002)(316002)(5660300001)(6666003)(478600001)(6486002)(4326008)(97736004)(6916009)(3846002)(107886003)(6116002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR02MB3631; 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; VI1PR02MB3631; 23:ofkI2rxBNT+SjedEyAp3GL+Y2nqMmhUZ3omrshFzA?= =?us-ascii?Q?Qsq40ue9XuXjg/PlQKb9osxzvQJPr5emctVlgLCr1HC+ZsdKdW71Z0no7YN8?= =?us-ascii?Q?l/6BJQ90u/WE5GdQ3cpJPZxcu6T4KikFwHdKNuLY4PzvH8XGwDnSfA6Z4ItW?= =?us-ascii?Q?W6+eUhIxN+4T6n+PsYzVUh1pEjyWeo+nmAQ8/baUP8Zq5FOoJkjHDOoT86q9?= =?us-ascii?Q?shE39a4aSvZBdvRd1vF0gPPt7kFO7bh4a/gFzm5jpE7/rGkfl6Hd7k4GKD9a?= =?us-ascii?Q?8Pip0K81GISn6WAJ/slgLRfH+oj6eU/WWpN3BPidt91ILkPSrRVIbkyRX04T?= =?us-ascii?Q?bWnvCWzOWByi6kqMennApNjuz25HTVO8BUWvwnnVUOAG7HnXVgfvrUkMFcPC?= =?us-ascii?Q?AT0VxFUB+4CXp/VDzw97QPsYkbTYjISQ++YpO01nTABM+0j9JUCr7v5JXyzl?= =?us-ascii?Q?913HDEgArrTMHGlTPkFNjKD3xiQED/ib8gOZ8E54UzdgUwrVoKkxUJjpTb8e?= =?us-ascii?Q?SGB3I1uxl3QQcv/u0p3oa2E7rcHxauPSZhppdW9JLmwze+GfbZdYMApg2plj?= =?us-ascii?Q?9L6IVbdv+nVwE6xJD9EdueADFqv3Zo8nnHdeVIBw1VsT6qx94r/wuUJHT3Bk?= =?us-ascii?Q?WyWWeNwbuIn5MIfr3jXOCTI61QiSnl7Px5A/AFbS+nE0Nx/UIvhW9TCNEBym?= =?us-ascii?Q?qtQanXFRhjm/oEjZwlomnRHhUp6hQCaapkIXen4BgNRJzKKLhQiJsRYsSNwk?= =?us-ascii?Q?bYCHe3X1apoX4jLhz9BF5tLGmOFfXXzKvo/oGWHKYSV9n/aanFoOF4dwCv+A?= =?us-ascii?Q?XBa4NIB5VoX3yb3fzkHifbB+8U/amrt4YcExV7G0DJfH/9Lqz0Oiiq8iyqEF?= =?us-ascii?Q?RF2/y4aJrJ9tgpX2tjSrag27DcYHRCr5p9ZbPoh/5DmWiKtungHbJ+kX61i+?= =?us-ascii?Q?6zynLD1yTVMep9gzfqhqdYkEoI6lgdPh2FI9SgNSPAF5bFW3xcQME7LtNhES?= =?us-ascii?Q?lbde9egn6VkD8SndTTSK50buESecaDyO77/wIzp9nx71Rm08r9jMDcchNgZh?= =?us-ascii?Q?XKtwvzvocXR+Mxi4/dTy0BagsiQPAXtwcHF6uHAs6heRGb3P8B3ZOfb9HGks?= =?us-ascii?Q?IT+yUs8+Cs2TK+tt23FfDNXi4d5tdh8cmjFx7pP4Zhz0baYUZ2qOyQPXUuYx?= =?us-ascii?Q?AtXO/xccLaU5OX7k61w/BhaXGBOA9c8krY3S2jLjEAXjOHrfay82cS/28vG8?= =?us-ascii?Q?ieaPvvvY9gX+7iJs6AA8kunaTQZrylIrRZGVCTzYqQYdILgLsuIiDK55t7Ht?= =?us-ascii?Q?FF01EEDzabph3jd5ARl4073F35YLw46RuXgyKvZ2R+UflL0NXzZk+WsoRxdr?= =?us-ascii?Q?Ci+ZAgPMXE691JE542Wmdcc6dL5Tlx8VP7kLX893dpBuoMR95A5LwM+YsgC2?= =?us-ascii?Q?PPuDugGQXrdcxCCUKme+jEEe6IkluI=3D?= X-Microsoft-Antispam-Message-Info: DpS/bXOvprcJ3NX3GvcnTjKaYSEPQN/vUQOiq0XK4LLrw7Md9w9acerf2wWQG+OTXkhaysKYpGdRq7c2WSVAwPHkxwahg5SLDFWdzeTIb8QIQL80P2D5y3aSdX+hN9eOoDR6VFrrZx1Kz6P8PjlPHjgLkH03Skr7d0uN2f7lfoQtkt7EbRlcIz8pGh53ZzSv X-Microsoft-Exchange-Diagnostics: 1; VI1PR02MB3631; 6:9/2f1bhhjLAvM26OhWvpcGlNRh6wocInaoiQuDrSSCaXFZ9auT6Wht2jB/aihu6rxhLzhSZMlY9I2YxAv8AchkVpN/+5o+QnwAdm4JAJWSaitfRa/DZ/20rJ/tR+lG9eQtagwhtJGxRL7nCjAtHpVkgki5Hvfk0d7c6bZEKhZAI0vY0gKT1m7/BJxwn6vIYwnci0JxFl+yEAnMeZLjAXPH8ycbTMmlADI0KQy1HD45H4RIbE2CzN9rAz9FQuFDKDZXfVCSPkARVCH6SQrIafwA1ZIH99Ijl8yHk6JpR1qGpA0/k7OxSN/yhdkqmv8EDbjJXXMQblIPToSTMicPv93I2cVE0F9tQ2NPd6CknKMkLK/+uKbnOaL5jq5eVTv/YwO83SrYr+qQK0sZuGL0bNg+QT4P68v1L8WEXxUF+M2QRfy4fL1Ioywrl0OvGRF7oFlhUHVTGmYoG+TtvcR1caRQ==; 5:aag4ohIcM/pbaECx+ZONlA7ZCSZZKyM3mp+29seNPrBlMM9gDL6TcXCeURZnUwskGigdwd8WXWXRZJbFgmOj/m2LzHMXlIsfoyrtaB85CSXUfYEk+AYkWZ2Km9F9BQNTC5YFussSRbM46Qrs4zkYtlWdNyAN+MBTJy4d56BBzXM=; 24:6ykKCChjEckzTA4EqZFhwzwwt4+EMJzjP+sQ/3jiM1897hzjEbar5Q8G+4tAAVM0RrlS3N2HDnNNF2AbSsZC7xKU4D7GkRziW7FIJkS0YrY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR02MB3631; 7:8LqJn2YlM8yZaIiWjkta/6EXgRnbcjaPD3jyQDJWiCvR2FLhQ7tJO7gsi6MPY1auWzQlHLJF2JPJ/4WL2prHs27tIttlvH5TVN0g6bstxpRyfPApsXwy0E6h5A7K8SDYvJ447HcFsIBIbWvD2SnUBT/o0HR8A4M9QLFi0IPJ4Wv+kRO04hTcqOpooKIeQ6VvU+Qfr2nC/XTw2qh8xTI5I56TAH30qlMuFpqCN8xQXACI9GfQNVQNj6Dc4FfBHyXC X-MS-Office365-Filtering-Correlation-Id: 2b9c14a6-0dcf-4903-405b-08d5cb874b04 X-OriginatorOrg: tandemg.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2018 08:27:07.8480 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b9c14a6-0dcf-4903-405b-08d5cb874b04 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d690b55a-f04a-454b-9f62-fb1e25467a25 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR02MB3631 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 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;