2014-04-06 15:48:28

by Jonas Hahnfeld

[permalink] [raw]
Subject: [PATCH] staging: rtl8187se: Fix warning symbol should be static

This patch solves some sparse warnings about "symbol [...] was not
declared. Should it be static?" by including the correct header files.

Signed-off-by: Jonas Hahnfeld <[email protected]>
---
Tested by compile only

drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c | 1 +
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 1 +
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c | 1 +
drivers/staging/rtl8187se/r8180_wx.c | 1 +
4 files changed, 4 insertions(+)

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
index 101f0c0..03462c3 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
@@ -19,6 +19,7 @@
#include <linux/string.h>
#include <linux/errno.h>

+#include "../r8180.h"
#include "ieee80211.h"

MODULE_AUTHOR("Jouni Malinen");
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
index 4fe2538..7eae3d9 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
@@ -21,6 +21,7 @@
#include <linux/string.h>
#include <linux/wireless.h>

+#include "../r8180.h"
#include "ieee80211.h"

#include <linux/crypto.h>
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
index f253672..288f86c 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
@@ -17,6 +17,7 @@
#include <linux/skbuff.h>
#include <linux/string.h>

+#include "../r8180.h"
#include "ieee80211.h"

#include <linux/crypto.h>
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
index b552491..57bf01f 100644
--- a/drivers/staging/rtl8187se/r8180_wx.c
+++ b/drivers/staging/rtl8187se/r8180_wx.c
@@ -20,6 +20,7 @@

#include "r8180.h"
#include "r8180_hw.h"
+#include "r8180_wx.h"

#include <net/iw_handler.h>
#include "ieee80211/dot11d.h"
--
1.9.1


2014-04-06 16:09:21

by Josh Triplett

[permalink] [raw]
Subject: Re: [PATCH] staging: rtl8187se: Fix warning symbol should be static

On Sun, Apr 06, 2014 at 05:46:04PM +0200, Jonas Hahnfeld wrote:
> This patch solves some sparse warnings about "symbol [...] was not
> declared. Should it be static?" by including the correct header files.
>
> Signed-off-by: Jonas Hahnfeld <[email protected]>

Reviewed-by: Josh Triplett <[email protected]>

> Tested by compile only
>
> drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c | 1 +
> drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 1 +
> drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c | 1 +
> drivers/staging/rtl8187se/r8180_wx.c | 1 +
> 4 files changed, 4 insertions(+)
>
> diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
> index 101f0c0..03462c3 100644
> --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
> +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
> @@ -19,6 +19,7 @@
> #include <linux/string.h>
> #include <linux/errno.h>
>
> +#include "../r8180.h"
> #include "ieee80211.h"
>
> MODULE_AUTHOR("Jouni Malinen");
> diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
> index 4fe2538..7eae3d9 100644
> --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
> +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
> @@ -21,6 +21,7 @@
> #include <linux/string.h>
> #include <linux/wireless.h>
>
> +#include "../r8180.h"
> #include "ieee80211.h"
>
> #include <linux/crypto.h>
> diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
> index f253672..288f86c 100644
> --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
> +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
> @@ -17,6 +17,7 @@
> #include <linux/skbuff.h>
> #include <linux/string.h>
>
> +#include "../r8180.h"
> #include "ieee80211.h"
>
> #include <linux/crypto.h>
> diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
> index b552491..57bf01f 100644
> --- a/drivers/staging/rtl8187se/r8180_wx.c
> +++ b/drivers/staging/rtl8187se/r8180_wx.c
> @@ -20,6 +20,7 @@
>
> #include "r8180.h"
> #include "r8180_hw.h"
> +#include "r8180_wx.h"
>
> #include <net/iw_handler.h>
> #include "ieee80211/dot11d.h"
> --
> 1.9.1
>

2014-04-07 01:34:59

by Stefan Lippers-Hollmann

[permalink] [raw]
Subject: Re: [PATCH] staging: rtl8187se: Fix warning symbol should be static

Hi

On Sunday 06 April 2014, Josh Triplett wrote:
> On Sun, Apr 06, 2014 at 05:46:04PM +0200, Jonas Hahnfeld wrote:
> > This patch solves some sparse warnings about "symbol [...] was not
> > declared. Should it be static?" by including the correct header files.
> >
> > Signed-off-by: Jonas Hahnfeld <[email protected]>
>
> Reviewed-by: Josh Triplett <[email protected]>
[...]

Given that that rtl8187se support has already been merged mainline (for
3.15-rc1) into the existing rtl8180 (soon to be renamed to rtl818x)
driver, wouldn't it make more sense to remove
drivers/staging/rtl8187se/ rather than trying to fixing it?

commit 1eba648f998ef9c31b8cf062754a4a7b4ab9001f
Author: Andrea Merello <[email protected]>
Date: Wed Mar 26 21:04:23 2014 +0100

rtl8180: enable rtl8187se support

Finally make rtl8187se works (hopefylly).
This patch adds PCI ID for rtl8187, updates copyright notes and
updates MODULE_DESCRIPTION.

Signed-off-by: Andrea Merello <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

Regards
Stefan Lippers-Hollmann

2014-04-07 14:44:59

by Jonas Hahnfeld

[permalink] [raw]
Subject: Re: [PATCH] staging: rtl8187se: Fix warning symbol should be static

Am Montag, den 07.04.2014, 01:34 +0000 schrieb Stefan Lippers-Hollmann:
> Hi
>
> On Sunday 06 April 2014, Josh Triplett wrote:
> > On Sun, Apr 06, 2014 at 05:46:04PM +0200, Jonas Hahnfeld wrote:
> > > This patch solves some sparse warnings about "symbol [...] was not
> > > declared. Should it be static?" by including the correct header files.
> > >
> > > Signed-off-by: Jonas Hahnfeld <[email protected]>
> >
> > Reviewed-by: Josh Triplett <[email protected]>
> [...]
>
> Given that that rtl8187se support has already been merged mainline (for
> 3.15-rc1) into the existing rtl8180 (soon to be renamed to rtl818x)
> driver, wouldn't it make more sense to remove
> drivers/staging/rtl8187se/ rather than trying to fixing it?
>
> commit 1eba648f998ef9c31b8cf062754a4a7b4ab9001f
> Author: Andrea Merello <[email protected]>
> Date: Wed Mar 26 21:04:23 2014 +0100
>
> rtl8180: enable rtl8187se support
>
> Finally make rtl8187se works (hopefylly).
> This patch adds PCI ID for rtl8187, updates copyright notes and
> updates MODULE_DESCRIPTION.
>
> Signed-off-by: Andrea Merello <[email protected]>
> Signed-off-by: John W. Linville <[email protected]>
>
> Regards
> Stefan Lippers-Hollmann

Yes, probably. Sorry, didn't know that, hadn't looked after this!