Staging: rtl8192e: Fix declaration of symbols
PATCH v3 1/1 Staging: rtl8192e: Fix declaration of symbols
The two declarations with issues in rtl_wx.h:
* function: struct iw_statistics *r8192_get_wireless_stats();
* variable: extern struct iw_handler_def r8192_wx_handlers_def;
The symbol 'r8192_get_wireless_stats' is declared as 'extern' but it is only used in the local scope. The declaration is deleted of rtl_wx.h, fixing the conflict with the 'extern' and 'static' scope.
The symbol 'r8192_wx_handlers_def' was fixed of some issues related to variable declaration marked as 'extern' implicitly, causing this sparse warning:
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c:1323:24: warning: symbol 'r8192_wx_handlers_def' was not declared. Should it be static?
Resolved incluing the fixed header to rtl_wx.c
Also, isn't declared as constant variable, so it declared as such. And delete unnecessary cast in rtl_core.c.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 3 ++- drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index c01abc2..fa087b6 100644
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -2
@@ -2926,8 +2926,7 @@ static int rtl8192_pci_probe(struct pci_dev *pdev, dev->netdev_ops = &rtl8192_netdev_ops; - dev->wireless_handlers = (struct iw_handler_def *) - &r8192_wx_handlers_def; + dev->wireless_handlers = &r8192_wx_handlers_def; dev->ethtool_ops = &rtl819x_ethtool_ops; dev->type =ARPHRD_ETHER ;
(quoted diff) +0 -0
b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 498995d..7d8fcde 100644
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +1 -0
@@ -19,6 +19,7 @@#include <linux/string.h> #include "rtl_core.h" +#include "rtl_wx.h" #define RATE_COUNT 12static u32 rtl8192_rates[] = {
@@ -1320,7 +1321,7 @@ static struct iw_statistics
*r8192_get_wireless_stats(struct net_device *dev)
return wstats;
}
-struct iw_handler_def r8192_wx_handlers_def = { +const struct iw_handler_def r8192_wx_handlers_def = {
.standard = r8192_wx_handlers, .num_standard = ARRAY_SIZE(r8192_wx_handlers), .private = r8192_private_handler,
(quoted diff) +0 -0
b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h
index 6a51a25..5839851 100644
drivers/staging/rtl8192e/rtl8192e/rtl_wx.h +1 -2
@@ -24,8 +24,7 @@ struct net_device;struct iw_handler_def ;struct iw_statistics ; -extern struct iw_handler_def r8192_wx_handlers_def; -struct iw_statistics *r8192_get_wireless_stats (struct net_device *dev); +extern const struct iw_handler_def r8192_wx_handlers_def;u16 rtl8192_11n_user_show_rates (struct net_device *dev);#endif
Signature · 1 line
1.9.1
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c static struct iw_statistics · line 1321
Quoted 12 lines · Joel Pelaez Jorge
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +1
-0@@ -19,6 +19,7 @@#include <linux/string.h> #include "rtl_core.h" +#include "rtl_wx.h" #define RATE_COUNT 12static u32 rtl8192_rates[] = {@@ -1320,7 +1321,7 @@ static struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
This patch is line-wrapped and doesn't apply. Read Documentation/email-clients.txt or use git send-email.
regards,
dan carpenter