Re: [PATCH] wireless: update old static regulatory domain rules

["John W. Linville" <linville@tuxdriver.com>]

On Thu, Dec 10, 2009 at 09:37:25AM +1100, Julian Calaby wrote:
> On Thu, Dec 10, 2009 at 07:15, John W. Linville <linville@tuxdriver.com> wrote:
> > Update "US" and "JP" for current rules, and replace "EU" rules with the
> > world roaming domain (since it was only a pseudo-domain anyway).
> >
> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
> > ---
> >  net/wireless/reg.c |   75 +++++++++++++++++----------------------------------
> >  1 files changed, 25 insertions(+), 50 deletions(-)
> >
> > diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> > index c01470e..baa898a 100644
> > --- a/net/wireless/reg.c
> > +++ b/net/wireless/reg.c
> > @@ -206,15 +179,17 @@ static const struct ieee80211_regdomain *static_regdom(char *alpha2)
> >                return &us_regdom;
> >        if (alpha2[0] == 'J' && alpha2[1] == 'P')
> >                return &jp_regdom;
> > +       /* Use world roaming rules for "EU", since it was a pseudo
> > +          domain anyway... */
> >        if (alpha2[0] == 'E' && alpha2[1] == 'U')
> > -               return &eu_regdom;
> > -       /* Default, as per the old rules */
> > -       return &us_regdom;
> > +               return &world_regdom;
> > +       /* Default, world roaming rules */
> > +       return &world_regdom;
> >  }
> 
> Is the if statement for the "EU" regdom really necessary (except as
> documentation) as we're returning &world_regdom by default?

No, it's not necessary except as documentation.  However, I like it
just for that reason. :-)

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