summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-05-09 12:04:49 +0200
committerBen Hutchings <ben@decadent.org.uk>2017-11-11 13:34:01 +0000
commitc6291fcd19e1eab1fa5fdf7030e285b57580d57f (patch)
treef3017765f465027b8387535adaa042b5f0b0f944 /drivers/staging
parent7b8920300697cab19fcf0db1e334ffe963580e9c (diff)
downloadlinux-stable-c6291fcd19e1eab1fa5fdf7030e285b57580d57f.tar.gz
linux-stable-c6291fcd19e1eab1fa5fdf7030e285b57580d57f.tar.bz2
linux-stable-c6291fcd19e1eab1fa5fdf7030e285b57580d57f.zip
staging: r8192ee: prorperly format warning message
In stable/linux-3.16.y, we get a warning for 64-bit architectures: drivers/staging/rtl8192ee/pci.c: In function '_rtl_pci_rx_interrupt': include/linux/kern_levels.h:4:18: warning: format '%d' expects argument of type 'int', but argument 2 has type 'sk_buff_data_t {aka unsigned char *}' [-Wformat=] include/linux/kern_levels.h:4:18: warning: format '%d' expects argument of type 'int', but argument 3 has type 'sk_buff_data_t {aka unsigned char *}' [-Wformat=] The driver was removed in 3.18 before this was fixed, so there is no workaround to backport, but it's easy enough to avoid the problem by changing the printk message to something similar that uses proper accessors for the skb fields. Fixes: 78de2c063710 ("staging: r8192ee: Add source files for core driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8192ee/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rtl8192ee/pci.c b/drivers/staging/rtl8192ee/pci.c
index 3fe9b7ba01d6..1686b360e088 100644
--- a/drivers/staging/rtl8192ee/pci.c
+++ b/drivers/staging/rtl8192ee/pci.c
@@ -882,8 +882,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
} else {
if (err_count++ < 10) {
- pr_info("skb->end (%d) - skb->tail (%d) > len (%d)\n",
- skb->end, skb->tail, len);
+ pr_info("skb end: %d) - tailroom (%d) > len (%d)\n",
+ skb_end_offset(skb), skb_tailroom(skb), len);
RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_EMERG,
"RX desc\n",
(u8 *)pdesc, 32);