aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/wireless/reg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f0859eada758..f3b77f7b8e3d 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -585,6 +585,9 @@ static int max_subband_chan(int orig_cur_chan,
585 break; 585 break;
586 } 586 }
587 587
588 if (triplet->chans.num_channels == 0)
589 return 0;
590
588 /* Monitonically increasing channel order */ 591 /* Monitonically increasing channel order */
589 if (triplet->chans.first_channel <= end_subband_chan) 592 if (triplet->chans.first_channel <= end_subband_chan)
590 return 0; 593 return 0;
@@ -737,6 +740,9 @@ static struct ieee80211_regdomain *country_ie_2_rd(
737 break; 740 break;
738 } 741 }
739 742
743 if (triplet->chans.num_channels == 0)
744 return NULL;
745
740 /* 2 GHz */ 746 /* 2 GHz */
741 if (triplet->chans.first_channel <= 14) 747 if (triplet->chans.first_channel <= 14)
742 end_channel = triplet->chans.first_channel + 748 end_channel = triplet->chans.first_channel +