ns: Rename macspec helper function

TheThingsNetwork · Jan 2, 2025 · 822e453 · 822e453
1 parent b618ff3
commit 822e453
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/networkserver/mac/link_adr.go b/pkg/networkserver/mac/link_adr.go
@@ -330,7 +330,7 @@ func HandleLinkADRAns(
 	// with a LinkADRAns indicating which command elements were accepted and which were
 	// rejected. This behavior differs from when the uplink ADR bit is set, in which case the end-
 	// device accepts or rejects the entire command.
-	if macspec.UseADRBit(macState.LorawanVersion) {
+	if macspec.LinkADRReqRejected(macState.LorawanVersion) {
 		rejected = !pld.ChannelMaskAck ||
 			(adrEnabled && !pld.DataRateIndexAck) ||
 			(adrEnabled && !pld.TxPowerIndexAck)

diff --git a/pkg/specification/macspec/specification.go b/pkg/specification/macspec/specification.go
@@ -238,8 +238,9 @@ func ValidateUplinkPayloadSize(v ttnpb.MACVersion) bool {
 	return compareMACVersion(v, ttnpb.MACVersion_MAC_V1_1) >= 0
 }
 
-// UseADRBit reports whether v uses the ADR bit in the FCtrl field.
-func UseADRBit(v ttnpb.MACVersion) bool {
+// LinkADRReqRejected reports whether v uses the ADR bit in the FCtrl field
+// to modify which ACK bits needs to check in the LinkADRAns.
+func LinkADRReqRejected(v ttnpb.MACVersion) bool {
 	return compareMACVersion(v, ttnpb.MACVersion_MAC_V1_0_3) >= 0 &&
 		compareMACVersion(v, ttnpb.MACVersion_MAC_V1_0_4) <= 0
 }