- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / wireless / ath / regd.c

diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 077bcc1..039ac49 100644 (file)
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -450,7 +450,7 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
        const struct ieee80211_regdomain *regd;
 
        wiphy->reg_notifier = reg_notifier;
-       wiphy->strict_regulatory = true;
+       wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
 
        if (ath_is_world_regd(reg)) {
                /*
@@ -458,8 +458,7 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
                 * saved on the wiphy orig_* parameters
                 */
                regd = ath_world_regdomain(reg);
-               wiphy->custom_regulatory = true;
-               wiphy->strict_regulatory = false;
+               wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
        } else {
                /*
                 * This gets applied in the case of the absense of CRDA,