1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index e9804450ca6c..d2fc8400d3ab 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -8387,20 +8387,28 @@ static int ipw_wx_get_range(struct net_device *dev,
 
         i = 0;
         if (priv->ieee->mode & (IEEE_B | IEEE_G)) {
-                for (j = 0; j < geo->bg_channels && i < IW_MAX_FREQUENCIES;
-                     i++, j++) {
+                for (j = 0; j < geo->bg_channels && i < IW_MAX_FREQUENCIES; j++) {
+                        if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
+                            (geo->bg[j].flags & IEEE80211_CH_PASSIVE_ONLY))
+                                continue;
+
                         range->freq[i].i = geo->bg[j].channel;
                         range->freq[i].m = geo->bg[j].freq * 100000;
                         range->freq[i].e = 1;
+                        i++;
                 }
         }
 
         if (priv->ieee->mode & IEEE_A) {
-                for (j = 0; j < geo->a_channels && i < IW_MAX_FREQUENCIES;
-                     i++, j++) {
+                for (j = 0; j < geo->a_channels && i < IW_MAX_FREQUENCIES; j++) {
+                        if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
+                            (geo->a[j].flags & IEEE80211_CH_PASSIVE_ONLY))
+                                continue;
+
                         range->freq[i].i = geo->a[j].channel;
                         range->freq[i].m = geo->a[j].freq * 100000;
                         range->freq[i].e = 1;
+                        i++;
                 }
         }