ath9k: Convert ANI channel to a pointer

[safe/jmp/linux-2.6] / drivers / net / wireless / ath9k / regd.c

diff --git a/drivers/net/wireless/ath9k/regd.c b/drivers/net/wireless/ath9k/regd.c
index dfcc3b5..819feb9 100644 (file)
--- a/drivers/net/wireless/ath9k/regd.c
+++ b/drivers/net/wireless/ath9k/regd.c
@@ -16,9 +16,7 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include "core.h"
-#include "hw.h"
-#include "regd.h"
+#include "ath9k.h"
 #include "regd_common.h"
 
 /*
@@ -192,11 +190,11 @@ static void ath9k_reg_apply_5ghz_beaconing_flags(struct wiphy *wiphy,
                 * it by applying our static world regdomain by default during
                 * probe */
                if (!(reg_rule->flags & NL80211_RRF_NO_IBSS))
-                       ch->flags &= ~NL80211_RRF_NO_IBSS;
+                       ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
                if (!ath9k_is_radar_freq(ch->center_freq))
                        continue;
                if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
-                       ch->flags &= ~NL80211_RRF_PASSIVE_SCAN;
+                       ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
        }
 }