From patchwork Tue Jul 19 15:33:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102000 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp144192qga; Tue, 19 Jul 2016 08:34:57 -0700 (PDT) X-Received: by 10.98.93.204 with SMTP id n73mr25753751pfj.87.1468942497531; Tue, 19 Jul 2016 08:34:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q1si33293792pap.58.2016.07.19.08.34.53; Tue, 19 Jul 2016 08:34:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753981AbcGSPej (ORCPT + 29 others); Tue, 19 Jul 2016 11:34:39 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:63074 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753536AbcGSPeh (ORCPT ); Tue, 19 Jul 2016 11:34:37 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0Lz2oK-1bLFiT2FNo-014EG0; Tue, 19 Jul 2016 17:34:17 +0200 From: Arnd Bergmann To: linux-wireless@vger.kernel.org Cc: Kalle Valo , Larry Finger , netdev@vger.kernel.org, Jes Sorensen , Arnd Bergmann , Chaoming Li , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] rtlwifi: don't add include path for rtl8188ee Date: Tue, 19 Jul 2016 17:33:00 +0200 Message-Id: <20160719153403.2967812-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:5qujpUAqMLtCe+24v8hOLL81TAhxt85YI7auBde8yeBAr9uIzvp VY6XTrhgQhM+O/Mffw8HRkiiA/am+UwPPkHom5dHWLXpmjYDLKTcQMDJ9qdeomT9B1mwoGO yD7gFTp7IDb10VlW/TJpw8u/WCL10hRS6lAh31m8OCwrv8sYScgij4DN/ANC45dSAOnsZCx nQ4+rYXJSHI9X+IBeMyIw== X-UI-Out-Filterresults: notjunk:1; V01:K0:j5lo1XEgBXk=:TrpaffsSuRVOHJiDvolZJF nHQVWudhC53YcpXrbSmKzIcvDCcACe4ke5cq4syVUL3W4LExIZsjhmYwbF5x+4ScWN2sUFJLS iNwafQxIl6qigvkoMZvmM7mF4+lTSyYFeby8KJNgxC4nEsfJhaCLFjZVnm8EAg4+Tq6oiSgww opEpXokqHLW5uaG6PxO+wpp/QdSPwVjSGEIUR1wdwAfeJeaUiwRbkRcardzODwCmCrwd+DEQD nX6w0OnJ2cp7N8ejAJDkTZ+3CQvAz+2eYFMrZsKOygOnv3IkK6E3Ws7jQeFY4Fw8EFsdzpgn+ PK4LF5AwXLW393Pw82DDKlNH53yDUjnjSRt0UyTGu7n9+eOtiyCBP9k7UDLPbK2y/3cmOcySQ HCL0R387bAF5Uzk2+wpkbikcbQ7TtRQIc5UuV+lo9UeZbgJzcC1bi+MQ8+ewANrb5VJsQ1Ji3 m6hw3sCcebyuXhJVfqDzYpp3OyILnVHn5jnWIpJtcKJLtek+2nHwfv3FyJmWl7aJS91SHe64B yaV9UsavSFPDzI4+FdH19gnzDjuI2R+xZ+Uoyw2zoSq9Yjlj7+vGwme05+bTytLJnj9yZRkdg pfvqPxDRSNcgvpa5NttrzeV38rpJY+Yo+HXZ4ekIjWYwiPyr+sr2LCaW6PP9oUUUnrtIFbJIt 0IO4D8tO7xCGpV4GGLEaHns/O0XXGPIrFJ6ixTs6rxJuvdodPDk48bQ8yW0Z8ggxDDJw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For rtl8188ee, we pass -Idrivers/net/wireless/rtlwifi/ to gcc, however that directy no longer exists, so evidently this option is no longer required here and can be removed to avoid a warning when building with 'make W=1' or 'gcc -Wmissing-include-dirs' Signed-off-by: Arnd Bergmann --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile index a85419a37651..676e7de27f27 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile @@ -12,4 +12,4 @@ rtl8188ee-objs := \ obj-$(CONFIG_RTL8188EE) += rtl8188ee.o -ccflags-y += -Idrivers/net/wireless/rtlwifi -D__CHECK_ENDIAN__ +ccflags-y += -D__CHECK_ENDIAN__ From patchwork Tue Jul 19 15:33:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101999 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp144546qga; Tue, 19 Jul 2016 08:35:41 -0700 (PDT) X-Received: by 10.66.43.234 with SMTP id z10mr65957333pal.137.1468942541803; Tue, 19 Jul 2016 08:35:41 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p7si2711430pfp.244.2016.07.19.08.35.41; Tue, 19 Jul 2016 08:35:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753987AbcGSPf0 (ORCPT + 29 others); Tue, 19 Jul 2016 11:35:26 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51240 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbcGSPfX (ORCPT ); Tue, 19 Jul 2016 11:35:23 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LoHJh-1asxK00Fkv-00gGQb; Tue, 19 Jul 2016 17:35:09 +0200 From: Arnd Bergmann To: linux-wireless@vger.kernel.org Cc: Kalle Valo , Larry Finger , netdev@vger.kernel.org, Jes Sorensen , Arnd Bergmann , Greg Kroah-Hartman , Mateusz Kulikowski , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] staging/rtl8192e: use s8 instead of char Date: Tue, 19 Jul 2016 17:33:01 +0200 Message-Id: <20160719153403.2967812-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160719153403.2967812-1-arnd@arndb.de> References: <20160719153403.2967812-1-arnd@arndb.de> X-Provags-ID: V03:K0:+pTR/nPjIalvVD6Pux5ruGbYg3p8DX0RCjmyZfKTOBGuQHuPPB2 AJ8vdiYE5RTkgaBjT/IdFXraBUiwxUsbUbMYpiDx5mrQ/30N3GQumeoTGDdS7AVOk5QWks4 77TzLCxVegyzGnqlD2M8dgybM+BGvTuwfKaaFpUaTorqwLIKPUUA8W/BTaiHJnkf8kbiRyq UrXQrh0IZvYgLU3ak7m4A== X-UI-Out-Filterresults: notjunk:1; V01:K0:pTg0Ct99yNc=:PGlbI5NTnzCDIXFcNFtUt2 bloM6aArPHB4vfOJQlmkcRUmDCf79pu5pJZyPJZErbA5Kg6ZhauLdFoVxmHF0Mf3+CXljlren oSV3bf2wwHzmerkir77JlMqKf8xal5htAyCIhcyn/dg6lZCZP/jxsjACqqwi20psDlei2ROxT ks2RdnTlaHqeKVhPd2RuXv/+8Co5PcO2THTT8WSSGJhOgQk4kIsAxms1Bdm1TD1DMl+1balIR NhqJSPcTqmS4RTagQL7v6gfEuSRsn5Iu1IUS1/q37BVNlHtpqiZN9PvhRCsaBEMrqBCDpcnkY 6aDZO6Sqrf5ZkxZMIQCzi6YI1OHd1amUV+uM7vSh4fYoQcoqx5pNsgRdICbxtkx4SGTbLXQXS ZyfGTcdtyly/yK+3BASmAoMo+jmca6iXzHhcse7nTyAsVMyLwcjSaqifIlcDwqR7yZOvpHc/W Bzb0aQC4sxqQDhWa48NgUWWBDw1A8CQVCSJXL//MMVu/nUIBlq4ZXfTzRzYtYnOJYNGHVhwn1 r1pWt8DXP+rsa0vM6hOJbMmf9f8tnPpPrDClaczNwM2Ucxqo0qLVbGFKwBsxgJEIi0clap20z GKoXY6d/rpii30SmGwxjekJkuIjTTcDEUpfABPvQ6aZxOOfH434rCc4hNLKbLUv13vN2r422V xNADyc87cklb78lnbH86Vi3on9ob7t+MZZU/f86mYvmDP22EctzjUFkrBqcPDRExCHAs= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Compiling the rtlwifi drivers for ARM with gcc -Wextra warns about lots of incorrect code that results from 'char' being unsigned here, e.g. staging/rtl8192e/rtl8192e/r8192E_phy.c:1072:36: error: comparison is always false due to limited range of data type [-Werror=type-limits] staging/rtl8192e/rtl8192e/r8192E_phy.c:1104:36: error: comparison is always false due to limited range of data type [-Werror=type-limits] staging/rtl8192e/rtl8192e/rtl_core.c:1987:16: error: comparison is always false due to limited range of data type [-Werror=type-limits] staging/rtl8192e/rtl8192e/rtl_dm.c:782:37: error: comparison is always false due to limited range of data type [-Werror=type-limits] staging/rtl8192e/rtl819x_TSProc.c:326:14: error: comparison is always true due to limited range of data type [-Werror=type-limits] staging/rtl8192e/rtllib_softmac_wx.c:465:16: error: comparison is always false due to limited range of data type [-Werror=type-limits] This patch changes all uses of 'char' in this driver that refer to 8-bit integers to use 's8' instead, which is signed on all architectures. Signed-off-by: Arnd Bergmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 8 ++++---- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) -- 2.9.0 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index ba64a4f1b3a8..8d6bca61e7aa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1487,8 +1487,8 @@ static void _rtl92e_query_rxphystatus( struct phy_ofdm_rx_status_rxsc_sgien_exintfflag *prxsc; u8 *prxpkt; u8 i, max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg; - char rx_pwr[4], rx_pwr_all = 0; - char rx_snrX, rx_evmX; + s8 rx_pwr[4], rx_pwr_all = 0; + s8 rx_snrX, rx_evmX; u8 evm, pwdb_all; u32 RSSI, total_rssi = 0; u8 is_cck_rate = 0; @@ -1613,7 +1613,7 @@ static void _rtl92e_query_rxphystatus( 2) - 110; tmp_rxsnr = pofdm_buf->rxsnr_X[i]; - rx_snrX = (char)(tmp_rxsnr); + rx_snrX = (s8)(tmp_rxsnr); rx_snrX /= 2; priv->stats.rxSNRdB[i] = (long)rx_snrX; @@ -1643,7 +1643,7 @@ static void _rtl92e_query_rxphystatus( for (i = 0; i < max_spatial_stream; i++) { tmp_rxevm = pofdm_buf->rxevm_X[i]; - rx_evmX = (char)(tmp_rxevm); + rx_evmX = (s8)(tmp_rxevm); rx_evmX /= 2; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 5e3bbe5c3ca4..0698131e4300 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -630,7 +630,7 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) { struct r8192_priv *priv = rtllib_priv(dev); u8 powerlevel = 0, powerlevelOFDM24G = 0; - char ant_pwr_diff; + s8 ant_pwr_diff; u32 u4RegValue; if (priv->epromtype == EEPROM_93C46) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 13a5ddc2bea5..41e05f206300 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1982,7 +1982,7 @@ void rtl92e_update_rx_statistics(struct r8192_priv *priv, weighting) / 6; } -u8 rtl92e_rx_db_to_percent(char antpower) +u8 rtl92e_rx_db_to_percent(s8 antpower) { if ((antpower <= -100) || (antpower >= 20)) return 0; @@ -1993,9 +1993,9 @@ u8 rtl92e_rx_db_to_percent(char antpower) } /* QueryRxPwrPercentage */ -u8 rtl92e_evm_db_to_percent(char value) +u8 rtl92e_evm_db_to_percent(s8 value) { - char ret_val; + s8 ret_val; ret_val = value; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index f627fdc15a58..6921125c9d35 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -503,8 +503,8 @@ struct r8192_priv { u32 Pwr_Track; u8 CCKPresentAttentuation_20Mdefault; u8 CCKPresentAttentuation_40Mdefault; - char CCKPresentAttentuation_difference; - char CCKPresentAttentuation; + s8 CCKPresentAttentuation_difference; + s8 CCKPresentAttentuation; long undecorated_smoothed_pwdb; u32 MCSTxPowerLevelOriginalOffset[6]; @@ -604,8 +604,8 @@ void rtl92e_update_rx_pkt_timestamp(struct net_device *dev, long rtl92e_translate_to_dbm(struct r8192_priv *priv, u8 signal_strength_index); void rtl92e_update_rx_statistics(struct r8192_priv *priv, struct rtllib_rx_stats *pprevious_stats); -u8 rtl92e_evm_db_to_percent(char value); -u8 rtl92e_rx_db_to_percent(char antpower); +u8 rtl92e_evm_db_to_percent(s8 value); +u8 rtl92e_rx_db_to_percent(s8 antpower); void rtl92e_copy_mpdu_stats(struct rtllib_rx_stats *psrc_stats, struct rtllib_rx_stats *ptarget_stats); bool rtl92e_enable_nic(struct net_device *dev); diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 2c8a526773ed..e0a2fe5e6148 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -323,7 +323,7 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, if (ieee->current_network.qos_data.supported == 0) { UP = 0; } else { - if (!IsACValid(TID)) { + if (!IsACValid((s8)TID)) { netdev_warn(ieee->dev, "%s(): TID(%d) is not valid\n", __func__, TID); return false; From patchwork Tue Jul 19 15:33:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101998 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp144981qga; Tue, 19 Jul 2016 08:36:33 -0700 (PDT) X-Received: by 10.98.15.145 with SMTP id 17mr4444274pfp.40.1468942592080; Tue, 19 Jul 2016 08:36:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w185si3418052pfb.139.2016.07.19.08.36.31; Tue, 19 Jul 2016 08:36:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754028AbcGSPga (ORCPT + 29 others); Tue, 19 Jul 2016 11:36:30 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:52286 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753415AbcGSPg1 (ORCPT ); Tue, 19 Jul 2016 11:36:27 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0MYNd3-1buaZO3QH3-00VAcb; Tue, 19 Jul 2016 17:36:03 +0200 From: Arnd Bergmann To: linux-wireless@vger.kernel.org Cc: Kalle Valo , Larry Finger , netdev@vger.kernel.org, Jes Sorensen , Arnd Bergmann , Greg Kroah-Hartman , =?utf-8?q?Rapha=C3=ABl_Beamonte?= , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] staging/rtl8192u: use s8 instead of char Date: Tue, 19 Jul 2016 17:33:02 +0200 Message-Id: <20160719153403.2967812-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160719153403.2967812-1-arnd@arndb.de> References: <20160719153403.2967812-1-arnd@arndb.de> X-Provags-ID: V03:K0:FPNtitn7QbmrocH9n1IEzwssydo+4ZpfsoJF2J03MqF9Z3e1JxI Ba7Oe/5PCtUhpNCi4QT1qVyUYQmvjKL4dM8JlOGy88yywI2gv1MhYjhIQwq5Ft/bCn9BMLw JCHkB3upeEV4j/kmADcFXy1g9neU08oGNHvZC4Re27Mvs0GtnqmrbmkvqRAg0NPgeenx/gN yPbnYkRdSzZRabWkllQNQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:RhJc5ZNdaVo=:QLmq6w4acdgik2/9C1JRpU mA5Yw5NICvUJGOu9MKlx339RF+PuHLyMEhW7EfPZlfZzUMi6QsBZfCYDZ5MjubdNelIDEOzyV +OSnByPONL65kH7JU1u8wNMQWSv/d8R3H98UQVlc3wd9nMsMwgMIQuQO7ghPG41MrJ4CT6pjy /XU5LRvdR9j6jvLiUXQLemlHUik2tlIxrLzOqccQhk02p70wHCNCjL9XJvUempX75RFHPkLEF pP0PrlS8zDKjK8iQPrzGdvxLYl0FcX320DRTvyBRTND515cDn/q7NMysVNTGxcTFJleVlkbm6 03V1ZwaiopdnEdEUagY4YlIgpfqh8iYo4ZWWUKtuPx9eKSJXINmo+8SNe0tx1/5yvDud4eMWn TcpHeqakHCqwp2me3+5Cilj8Us4zxlRWI3g0uDHsTHbOICvIEXT9t1REZhUB6lmDT5UxmLNwP NxAvQ+Lv8sv+BKbs4VL+DmIYpMCx6LJFVf4cKEE/WyTKz2craBo5akvCu3nEwppDKnxObAfwW QbobywRZYnavuQGvUbwExTTeBf99GI7OUvOID3UF6ykPcx2Q/v3xZUqcLpTh7+/pXOVBtCCc9 CCwyoslvRC7GXIurpALX51+VEGNHvfXQaTcZ9iJd3xx3VXsyHunP/DWYBtr43CU5QaJlzBJOt vAySSuoDYEABZI0CRSp3rGjM21v3Ct9xYVudHl1HLQZ70tNopq9fwGN9f4xx4Zr89E/0= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Compiling the rtlwifi drivers for ARM with gcc -Wextra warns about lots of incorrect code that results from 'char' being unsigned here, e.g. staging/rtl8192u/r8192U_core.c:4150:16: error: comparison is always false due to limited range of data type [-Werror=type-limits] staging/rtl8192u/r8192U_dm.c:646:50: error: comparison is always false due to limited range of data type [-Werror=type-limits] This patch changes all uses of 'char' in this driver that refer to 8-bit integers to use 's8' instead, which is signed on all architectures. Signed-off-by: Arnd Bergmann --- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 ++-- drivers/staging/rtl8192u/r8192U.h | 4 ++-- drivers/staging/rtl8192u/r8192U_core.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) -- 2.9.0 diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index 09e9499b7f9d..077ea13eb1e7 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -746,7 +746,7 @@ struct ieee80211_rx_stats { bool bisrxaggrsubframe; bool bPacketBeacon; //cosa add for rssi bool bToSelfBA; //cosa add for rssi - char cck_adc_pwdb[4]; //cosa add for rx path selection + s8 cck_adc_pwdb[4]; //cosa add for rx path selection u16 Seq_Num; }; @@ -1814,7 +1814,7 @@ struct ieee80211_device { u32 wpax_type_notify; //{added by David, 2006.9.26} /* QoS related flag */ - char init_wmmparam_flag; + s8 init_wmmparam_flag; /* set on initialization */ u8 qos_support; diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h index 5dba6a28dd9b..b28bc7812caa 100644 --- a/drivers/staging/rtl8192u/r8192U.h +++ b/drivers/staging/rtl8192u/r8192U.h @@ -533,7 +533,7 @@ typedef struct _rt_9x_tx_rate_history { u32 ht_mcs[4][16]; } rt_tx_rahis_t, *prt_tx_rahis_t; typedef struct _RT_SMOOTH_DATA_4RF { - char elements[4][100]; /* array to store values */ + s8 elements[4][100]; /* array to store values */ u32 index; /* index to current array to store */ u32 TotalNum; /* num of valid elements */ u32 TotalVal[4]; /* sum of valid elements */ @@ -1031,7 +1031,7 @@ typedef struct r8192_priv { s8 cck_present_attentuation; u8 cck_present_attentuation_20Mdefault; u8 cck_present_attentuation_40Mdefault; - char cck_present_attentuation_difference; + s8 cck_present_attentuation_difference; bool btxpower_tracking; bool bcck_in_ch14; bool btxpowerdata_readfromEEPORM; diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index dd0970facdf5..f36b2d3b1ee9 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -4209,7 +4209,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, * * Return: 0-100 percentage *---------------------------------------------------------------------------*/ -static u8 rtl819x_query_rxpwrpercentage(char antpower) +static u8 rtl819x_query_rxpwrpercentage(s8 antpower) { if ((antpower <= -100) || (antpower >= 20)) return 0; @@ -4220,9 +4220,9 @@ static u8 rtl819x_query_rxpwrpercentage(char antpower) } /* QueryRxPwrPercentage */ -static u8 rtl819x_evm_dbtopercentage(char value) +static u8 rtl819x_evm_dbtopercentage(s8 value) { - char ret_val; + s8 ret_val; ret_val = value; @@ -4297,8 +4297,8 @@ static void rtl8192_query_rxphystatus(struct r8192_priv *priv, phy_ofdm_rx_status_rxsc_sgien_exintfflag *prxsc; u8 *prxpkt; u8 i, max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg; - char rx_pwr[4], rx_pwr_all = 0; - char rx_snrX, rx_evmX; + s8 rx_pwr[4], rx_pwr_all = 0; + s8 rx_snrX, rx_evmX; u8 evm, pwdb_all; u32 RSSI, total_rssi = 0; u8 is_cck_rate = 0; @@ -4423,7 +4423,7 @@ static void rtl8192_query_rxphystatus(struct r8192_priv *priv, /* Get Rx snr value in DB */ tmp_rxsnr = pofdm_buf->rxsnr_X[i]; - rx_snrX = (char)(tmp_rxsnr); + rx_snrX = (s8)(tmp_rxsnr); rx_snrX /= 2; priv->stats.rxSNRdB[i] = (long)rx_snrX; @@ -4457,7 +4457,7 @@ static void rtl8192_query_rxphystatus(struct r8192_priv *priv, for (i = 0; i < max_spatial_stream; i++) { tmp_rxevm = pofdm_buf->rxevm_X[i]; - rx_evmX = (char)(tmp_rxevm); + rx_evmX = (s8)(tmp_rxevm); /* Do not use shift operation like "rx_evmX >>= 1" * because the compiler of free build environment will