releases/2.6.36.2/cfg80211-fix-regression-on-processing-country-ies.patch

   1 From a171fba491f54216e356efa46096171a7ed01d10 Mon Sep 17 00:00:00 2001
   2 From: Luis R. Rodriguez <lrodriguez@atheros.com>
   3 Date: Mon, 18 Oct 2010 17:44:51 -0700
   4 Subject: cfg80211: fix regression on processing country IEs
   5
   6 From: Luis R. Rodriguez <lrodriguez@atheros.com>
   7
   8 commit a171fba491f54216e356efa46096171a7ed01d10 upstream.
   9
  10 The patch 4f366c5:
  11
  12         wireless: only use alpha2 regulatory information from country IE
  13
  14 removed some complex intersection we were always doing between the AP's
  15 country IE info and what we got from CRDA. When CRDA sent us back a
  16 regulatory domain we would do some sanity checks on that regulatory
  17 domain response we just got. Part of these sanity checks included
  18 checking that we already had performed an intersection for the
  19 request of NL80211_REGDOM_SET_BY_COUNTRY_IE type.
  20
  21 This mean that cfg80211 was only processing country IEs for cases
  22 where we already had an intersection, but since we removed enforcing
  23 this this is no longer required, we should just apply the country
  24 IE country hint with the data received from CRDA.
  25
  26 This patch has fixes intended for kernels >= 2.6.36.
  27
  28 Reported-by: Easwar Krishnan <easwar.krishnan@atheros.com>
  29 Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
  30 Signed-off-by: John W. Linville <linville@tuxdriver.com>
  31 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  32
  33 ---
  34  net/wireless/reg.c |    2 +-
  35  1 file changed, 1 insertion(+), 1 deletion(-)
  36
  37 --- a/net/wireless/reg.c
  38 +++ b/net/wireless/reg.c
  39 @@ -1170,7 +1170,7 @@ static int ignore_request(struct wiphy *
  40                                 return 0;
  41                         return -EALREADY;
  42                 }
  43 -               return REG_INTERSECT;
  44 +               return 0;
  45         case NL80211_REGDOM_SET_BY_DRIVER:
  46                 if (last_request->initiator == NL80211_REGDOM_SET_BY_CORE) {
  47                         if (regdom_changes(pending_request->alpha2))