From: Jake Edge <jake@edge2.net>
Date: Sun, 13 Apr 2014 17:10:45 +0000 (-0600)
Subject: staging/rtl8187se fix sparse complaints
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=038dcf12b6ca9dcf3e8e50d13326f7b4ef6a196f;p=linux-beck.git

staging/rtl8187se fix sparse complaints

Fix the following sparse complaints:

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt.c:201:5: warning: symbol 'ieee80211_crypto_init' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt.c:222:6: warning: symbol 'ieee80211_crypto_deinit' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_ccmp.c:446:5: warning: symbol 'ieee80211_crypto_ccmp_init' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_ccmp.c:452:6: warning: symbol 'ieee80211_crypto_ccmp_exit' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_wep.c:264:5: warning: symbol 'ieee80211_crypto_wep_init' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_wep.c:269:6: warning: symbol 'ieee80211_crypto_wep_exit' was not declared. Should it be static?

by adding an include file into source files and moving some
declarations around into the proper header files.

Signed-off-by: Jake Edge <jake@edge2.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
index 0b4ea431982d..8fe787363d21 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
@@ -83,4 +83,13 @@ void ieee80211_crypt_deinit_handler(unsigned long);
 void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
 				    struct ieee80211_crypt_data **crypt);
 
+/* fun with the built-in ieee80211 stack... */
+int ieee80211_crypto_init(void);
+void ieee80211_crypto_deinit(void);
+int ieee80211_crypto_tkip_init(void);
+void ieee80211_crypto_tkip_exit(void);
+int ieee80211_crypto_ccmp_init(void);
+void ieee80211_crypto_ccmp_exit(void);
+int ieee80211_crypto_wep_init(void);
+void ieee80211_crypto_wep_exit(void);
 #endif
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index 9f931dba1d82..cf510b65a98a 100644
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -629,12 +629,3 @@ bool MgntActSet_RF_State(struct net_device *dev, enum rt_rf_power_state StateToS
 
 #endif
 
-/* fun with the built-in ieee80211 stack... */
-extern int ieee80211_crypto_init(void);
-extern void ieee80211_crypto_deinit(void);
-extern int ieee80211_crypto_tkip_init(void);
-extern void ieee80211_crypto_tkip_exit(void);
-extern int ieee80211_crypto_ccmp_init(void);
-extern void ieee80211_crypto_ccmp_exit(void);
-extern int ieee80211_crypto_wep_init(void);
-extern void ieee80211_crypto_wep_exit(void);
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index a6022d4e7573..cbdff00323f2 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -47,6 +47,7 @@
 #include "r8180_dm.h"
 
 #include "ieee80211/dot11d.h"
+#include "ieee80211/ieee80211_crypt.h"
 
 static struct pci_device_id rtl8180_pci_id_tbl[] = {
 	{