From: Larry Finger <Larry.Finger@lwfinger.net>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, troy_tan@realsil.com.cn,
Larry Finger <Larry.Finger@lwfinger.net>,
netdev@vger.kernel.org
Subject: [PATCH 01/11 NEXT] rtlwifi: btcoexist: Fix Smatch warning
Date: Mon, 22 Sep 2014 09:39:17 -0500 [thread overview]
Message-ID: <1411396767-20611-2-git-send-email-Larry.Finger@lwfinger.net> (raw)
In-Reply-To: <1411396767-20611-1-git-send-email-Larry.Finger@lwfinger.net>
The capability for 802.11ac will soon be added to these drivers. Once
that is done, a bitmask will be too large for the data storage.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +-
drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +-
drivers/net/wireless/rtlwifi/wifi.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
index fcf7459..b2791c8 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -505,7 +505,7 @@ static void halbtc_write_1byte(void *bt_context, u32 reg_addr, u32 data)
}
static void halbtc_bitmask_write_1byte(void *bt_context, u32 reg_addr,
- u8 bit_mask, u8 data)
+ u32 bit_mask, u8 data)
{
struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context;
struct rtl_priv *rtlpriv = btcoexist->adapter;
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
index 1345545..0a903ea 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -359,7 +359,7 @@ typedef u32 (*bfp_btc_r4)(void *btc_context, u32 reg_addr);
typedef void (*bfp_btc_w1)(void *btc_context, u32 reg_addr, u32 data);
typedef void (*bfp_btc_w1_bit_mak)(void *btc_context, u32 reg_addr,
- u8 bit_mask, u8 data1b);
+ u32 bit_mask, u8 data1b);
typedef void (*bfp_btc_w2)(void *btc_context, u32 reg_addr, u16 data);
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 541b077..a943a24 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1267,7 +1267,7 @@ struct rtl_mac {
u8 sgi_40;
u8 sgi_20;
u8 bw_40;
- u8 mode; /* wireless mode */
+ u16 mode; /* wireless mode */
u8 slot_time;
u8 short_preamble;
u8 use_cts_protect;
--
1.8.4.5
next prev parent reply other threads:[~2014-09-22 14:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 14:39 [PATCH 00/11 NEXT] Modify rtlwifi, rtl_pci, rtl8188ee, and rtl8821ae for merge with Realtek code repo Larry Finger
2014-09-22 14:39 ` Larry Finger [this message]
2014-09-22 14:39 ` [PATCH 02/11 NEXT] rtlwifi: Remove extra workqueue for enter/leave power state Larry Finger
2014-09-22 14:39 ` [PATCH 03/11 NEXT] rtlwifi: rtl_pci: Start modification for new drivers Larry Finger
2014-09-22 14:39 ` [PATCH 06/11 NEXT] rtlwifi: Modify cam.{c,h} and efuse.{c,h} " Larry Finger
2014-09-22 14:39 ` [PATCH 07/11 NEXT] rtlwifi: Update power-save routines for 062814 driver Larry Finger
[not found] ` <1411396767-20611-1-git-send-email-Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
2014-09-22 14:39 ` [PATCH 04/11 NEXT] rtlwifi: Modify core.c for new drivers Larry Finger
2014-09-22 14:39 ` [PATCH 05/11 NEXT] rtlwifi: Modify base.{c,h} " Larry Finger
2014-09-22 14:39 ` [PATCH 08/11 NEXT] rtlwifi: Finish modifying core routines " Larry Finger
2014-09-22 14:39 ` [PATCH 09/11 NEXT] rtlwifi: rtl8188ee: Update driver to match Realtek release of 06282014 Larry Finger
2014-09-22 14:39 ` [PATCH 10/11 NEXT] rtlwifi: rtl8821ae: Move driver from staging to regular tree Larry Finger
2014-09-22 14:39 ` [PATCH 11/11 NEXT] rtlwifi: Fix problems with building an allyesconfig Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411396767-20611-2-git-send-email-Larry.Finger@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=troy_tan@realsil.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).