1 files changed, 44 insertions, 4 deletions

diff --git a/net/ieee80211/ieee80211_geo.c b/net/ieee80211/ieee80211_geo.c
index 610cc5cbc252..192243ab35ed 100644
--- a/net/ieee80211/ieee80211_geo.c
+++ b/net/ieee80211/ieee80211_geo.c
@@ -50,7 +50,8 @@ int ieee80211_is_valid_channel(struct ieee80211_device *ieee, u8 channel)
 
         /* Driver needs to initialize the geography map before using
          * these helper functions */
-        BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);
+        if (ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0)
+                return 0;
 
         if (ieee->freq_band & IEEE80211_24GHZ_BAND)
                 for (i = 0; i < ieee->geo.bg_channels; i++)
@@ -58,13 +59,15 @@ int ieee80211_is_valid_channel(struct ieee80211_device *ieee, u8 channel)
                          * this is a B only channel, we don't see it
                          * as valid. */
                         if ((ieee->geo.bg[i].channel == channel) &&
+                            !(ieee->geo.bg[i].flags & IEEE80211_CH_INVALID) &&
                             (!(ieee->mode & IEEE_G) ||
                              !(ieee->geo.bg[i].flags & IEEE80211_CH_B_ONLY)))
                                 return IEEE80211_24GHZ_BAND;
 
         if (ieee->freq_band & IEEE80211_52GHZ_BAND)
                 for (i = 0; i < ieee->geo.a_channels; i++)
-                        if (ieee->geo.a[i].channel == channel)
+                        if ((ieee->geo.a[i].channel == channel) &&
+                            !(ieee->geo.a[i].flags & IEEE80211_CH_INVALID))
                                 return IEEE80211_52GHZ_BAND;
 
         return 0;
@@ -76,7 +79,8 @@ int ieee80211_channel_to_index(struct ieee80211_device *ieee, u8 channel)
 
         /* Driver needs to initialize the geography map before using
          * these helper functions */
-        BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);
+        if (ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0)
+                return -1;
 
         if (ieee->freq_band & IEEE80211_24GHZ_BAND)
                 for (i = 0; i < ieee->geo.bg_channels; i++)
@@ -97,7 +101,8 @@ u8 ieee80211_freq_to_channel(struct ieee80211_device * ieee, u32 freq)
 
         /* Driver needs to initialize the geography map before using
          * these helper functions */
-        BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);
+        if (ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0)
+                return 0;
 
         freq /= 100000;
 
@@ -133,6 +138,41 @@ const struct ieee80211_geo *ieee80211_get_geo(struct ieee80211_device *ieee)
         return &ieee->geo;
 }
 
+u8 ieee80211_get_channel_flags(struct ieee80211_device * ieee, u8 channel)
+{
+        int index = ieee80211_channel_to_index(ieee, channel);
+
+        if (index == -1)
+                return IEEE80211_CH_INVALID;
+
+        if (channel <= IEEE80211_24GHZ_CHANNELS)
+                return ieee->geo.bg[index].flags;
+
+        return ieee->geo.a[index].flags;
+}
+
+static const struct ieee80211_channel bad_channel = {
+        .channel = 0,
+        .flags = IEEE80211_CH_INVALID,
+        .max_power = 0,
+};
+
+const struct ieee80211_channel *ieee80211_get_channel(struct ieee80211_device
+                                                      *ieee, u8 channel)
+{
+        int index = ieee80211_channel_to_index(ieee, channel);
+
+        if (index == -1)
+                return &bad_channel;
+
+        if (channel <= IEEE80211_24GHZ_CHANNELS)
+                return &ieee->geo.bg[index];
+
+        return &ieee->geo.a[index];
+}
+
+EXPORT_SYMBOL(ieee80211_get_channel);
+EXPORT_SYMBOL(ieee80211_get_channel_flags);
 EXPORT_SYMBOL(ieee80211_is_valid_channel);
 EXPORT_SYMBOL(ieee80211_freq_to_channel);
 EXPORT_SYMBOL(ieee80211_channel_to_index);