2011-12-08 11:27:18

by Rajkumar Manoharan

Subject: [PATCH] cfg80211: notify core hints that helps to restore regd settings

Regulatory updates set by CORE are ignored for custom regulatory cards.
Let us notify the changes to the driver, as some drivers uses core hint
to restore its orig_* reg domain setting.

Cc: Paul Stewart <[email protected]>
Signed-off-by: Rajkumar Manoharan <[email protected]>
---
net/wireless/reg.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index db958ba..c45c8b7 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1175,9 +1175,21 @@ void regulatory_update(struct wiphy *wiphy,
static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
{
struct cfg80211_registered_device *rdev;
+ struct wiphy *wiphy;

- list_for_each_entry(rdev, &cfg80211_rdev_list, list)
- wiphy_update_regulatory(&rdev->wiphy, initiator);
+ list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
+ wiphy = &rdev->wiphy;
+ wiphy_update_regulatory(wiphy, initiator);
+ /*
+ * Regulatory updates set by CORE are ignored for custom
+ * regulatory cards. Let us notify the changes to the driver,
+ * as some drivers used this to restore its orig_* reg domain.
+ */
+ if (initiator == NL80211_REGDOM_SET_BY_CORE &&
+ wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY &&
+ wiphy->reg_notifier)
+ wiphy->reg_notifier(wiphy, last_request);
+ }
}

static void handle_channel_custom(struct wiphy *wiphy,
--
1.7.8

2011-12-08 15:56:37

by Luis R. Rodriguez

Subject: Re: [PATCH] cfg80211: notify core hints that helps to restore regd settings

On Thu, Dec 8, 2011 at 3:26 AM, Rajkumar Manoharan
<[email protected]> wrote:
> Regulatory updates set by CORE are ignored for custom regulatory cards.
> Let us notify the changes to the driver, as some drivers uses core hint
> to restore its orig_* reg domain setting.
>
> Cc: Paul Stewart <[email protected]>
> Signed-off-by: Rajkumar Manoharan <[email protected]>
> ---
>  net/wireless/reg.c |   16 ++++++++++++++--
>  1 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index db958ba..c45c8b7 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -1175,9 +1175,21 @@ void regulatory_update(struct wiphy *wiphy,
>  static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
>  {
>        struct cfg80211_registered_device *rdev;
> +       struct wiphy *wiphy;
>
> -       list_for_each_entry(rdev, &cfg80211_rdev_list, list)
> -               wiphy_update_regulatory(&rdev->wiphy, initiator);
> +       list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
> +               wiphy = &rdev->wiphy;
> +               wiphy_update_regulatory(wiphy, initiator);
> +               /*
> +                * Regulatory updates set by CORE are ignored for custom
> +                * regulatory cards. Let us notify the changes to the driver,
> +                * as some drivers used this to restore its orig_* reg domain.
> +                */
> +               if (initiator == NL80211_REGDOM_SET_BY_CORE &&
> +                   wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY &&
> +                   wiphy->reg_notifier)
> +                       wiphy->reg_notifier(wiphy, last_request);
> +       }

This looks ugly but for now its fine as the alternative is to add
another callback for restoring regulatory settings. I'll take this
into consideration in the regulatory simulator where I'm rewriting all
this.

Acked-by: Luis R. Rodriguez <[email protected]>

Luis