---

yaml --- r: 183656 b: refs/heads/master c: a0f2e0f h: refs/heads/master v: v3
git-mirror · Jan 14, 2010 · 481243d · 481243d
1 parent b21ce5a
commit 481243d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c99445b14054e0c4ed4715df1dad1fc608cbab46
+refs/heads/master: a0f2e0fca1e72c1de07e834be05b61d33842253e
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -585,6 +585,9 @@ static int max_subband_chan(int orig_cur_chan,
 			break;
 		}
 
+		if (triplet->chans.num_channels == 0)
+			return 0;
+
 		/* Monitonically increasing channel order */
 		if (triplet->chans.first_channel <= end_subband_chan)
 			return 0;
@@ -737,6 +740,9 @@ static struct ieee80211_regdomain *country_ie_2_rd(
 			break;
 		}
 
+		if (triplet->chans.num_channels == 0)
+			return NULL;
+
 		/* 2 GHz */
 		if (triplet->chans.first_channel <= 14)
 			end_channel = triplet->chans.first_channel +