Do not enable more channels than Default + CFList

TheThingsArchive · Mar 17, 2020 · 2e549df · 2e549df
1 parent 94b296d
commit 2e549df
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/networkserver/adr.go b/core/networkserver/adr.go
@@ -271,7 +271,7 @@ func getAdrReqPayloads(dev *device.Device, frequencyPlan *band.FrequencyPlan, dr
 		} else {
 			for i, ch := range frequencyPlan.UplinkChannels {
 				for _, dr := range ch.DataRates {
-					if dr == drIdx {
+					if dr == drIdx && i < 8 { // We can enable up to 8 channels.
 						payloads[0].ChMask[i] = true
 					}
 				}
@@ -300,7 +300,7 @@ func getAdrReqPayloads(dev *device.Device, frequencyPlan *band.FrequencyPlan, dr
 		} else {
 			for i, ch := range frequencyPlan.UplinkChannels {
 				for _, dr := range ch.DataRates {
-					if dr == drIdx {
+					if dr == drIdx && i < 7 { // We can enable up to 7 channels.
 						payloads[0].ChMask[i] = true
 					}
 				}