[PATCH] minstrel_ht: mark minstrel_mcs_groups as static

[PATCH] minstrel_ht: mark minstrel_mcs_groups as static

[John W. Linville]

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 net/mac80211/rc80211_minstrel_ht.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 7a04951..a8f658c 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -59,7 +59,7 @@
  * groups, based on the number of streams and flags (HT40, SGI) that they
  * use.
  */
-const struct mcs_group minstrel_mcs_groups[] = {
+static const struct mcs_group minstrel_mcs_groups[] = {
 	MCS_GROUP(1, 0, 0),
 	MCS_GROUP(2, 0, 0),
 #if MINSTREL_MAX_STREAMS >= 3
-- 
1.7.0.1

Re: [PATCH] minstrel_ht: mark minstrel_mcs_groups as static

[Felix Fietkau]

On 2010-06-24 5:16 PM, John W. Linville wrote:
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
>  net/mac80211/rc80211_minstrel_ht.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> index 7a04951..a8f658c 100644
> --- a/net/mac80211/rc80211_minstrel_ht.c
> +++ b/net/mac80211/rc80211_minstrel_ht.c
> @@ -59,7 +59,7 @@
>   * groups, based on the number of streams and flags (HT40, SGI) that they
>   * use.
>   */
> -const struct mcs_group minstrel_mcs_groups[] = {
> +static const struct mcs_group minstrel_mcs_groups[] = {
NACK. minstrel_ht debugfs needs this. The proper fix for the warning is
to add this one to a header file instead.

- Felix

[PATCH] minstrel_ht: move minstrel_mcs_groups declaration to header file

[John W. Linville]

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 net/mac80211/rc80211_minstrel_ht.h         |    2 ++
 net/mac80211/rc80211_minstrel_ht_debugfs.c |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rc80211_minstrel_ht.h b/net/mac80211/rc80211_minstrel_ht.h
index 696c0fc..462d2b2 100644
--- a/net/mac80211/rc80211_minstrel_ht.h
+++ b/net/mac80211/rc80211_minstrel_ht.h
@@ -29,6 +29,8 @@ struct mcs_group {
 	unsigned int duration[MCS_GROUP_RATES];
 };
 
+extern const struct mcs_group minstrel_mcs_groups[];
+
 struct minstrel_rate_stats {
 	/* current / last sampling period attempts/success counters */
 	unsigned int attempts, last_attempts;
diff --git a/net/mac80211/rc80211_minstrel_ht_debugfs.c b/net/mac80211/rc80211_minstrel_ht_debugfs.c
index 4fb3ccb..4a5a4b3 100644
--- a/net/mac80211/rc80211_minstrel_ht_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c
@@ -14,8 +14,6 @@
 #include "rc80211_minstrel.h"
 #include "rc80211_minstrel_ht.h"
 
-extern const struct mcs_group minstrel_mcs_groups[];
-
 static int
 minstrel_ht_stats_open(struct inode *inode, struct file *file)
 {
-- 
1.7.0.1

Re: [PATCH] minstrel_ht: mark minstrel_mcs_groups as static

[John W. Linville]

On Thu, Jun 24, 2010 at 06:47:54PM +0200, Felix Fietkau wrote:
> On 2010-06-24 5:16 PM, John W. Linville wrote:
> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
> > ---
> >  net/mac80211/rc80211_minstrel_ht.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> > index 7a04951..a8f658c 100644
> > --- a/net/mac80211/rc80211_minstrel_ht.c
> > +++ b/net/mac80211/rc80211_minstrel_ht.c
> > @@ -59,7 +59,7 @@
> >   * groups, based on the number of streams and flags (HT40, SGI) that they
> >   * use.
> >   */
> > -const struct mcs_group minstrel_mcs_groups[] = {
> > +static const struct mcs_group minstrel_mcs_groups[] = {
> NACK. minstrel_ht debugfs needs this. The proper fix for the warning is
> to add this one to a header file instead.

Yup, fair enough.  Replacement patch to follow.

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH] minstrel_ht: move minstrel_mcs_groups declaration to header file

[Felix Fietkau]

On 2010-06-24 7:06 PM, John W. Linville wrote:
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Felix Fietkau <nbd@openwrt.org>
(for the other minstrel_ht patch as well)

- Felix