HOS-21652: Fixing physical mode to mac protocol mode mapping

extremenetworks · Sep 18, 2024 · bd889be · bd889be
2 parents 6551ce4 + 94e9b1b
commit bd889be
Showing 1 changed file with 27 additions and 43 deletions.
diff --git a/plugins/inputs/ah_wireless/ah_wireless_defines.go b/plugins/inputs/ah_wireless/ah_wireless_defines.go
@@ -892,49 +892,33 @@ func ah_ifname_radio2vap(radio_name string ) string {
 
 func getMacProtoMode(phymode uint32) uint32 {
 
-    switch {
-        case phymode == IEEE80211_MODE_11A:
-        case phymode == IEEE80211_MODE_TURBO_A:
-		return AH_DCD_NMS_PHY_MODE_A
-
-	case phymode == IEEE80211_MODE_11B:
-		return AH_DCD_NMS_PHY_MODE_B
-
-	case phymode == IEEE80211_MODE_11NA_HT20:
-	case phymode == IEEE80211_MODE_11NA_HT40PLUS:
-	case phymode == IEEE80211_MODE_11NA_HT40MINUS:
-	case phymode == IEEE80211_MODE_11NA_HT40:
-		return AH_DCD_NMS_PHY_MODE_NA
-
-	case phymode == IEEE80211_MODE_11NG_HT20:
-	case phymode == IEEE80211_MODE_11NG_HT40PLUS:
-	case phymode == IEEE80211_MODE_11NG_HT40MINUS:
-	case phymode == IEEE80211_MODE_11NG_HT40:
-		return AH_DCD_NMS_PHY_MODE_NG
-	case phymode == IEEE80211_MODE_11AC_VHT20:
-	case phymode == IEEE80211_MODE_11AC_VHT40PLUS:
-	case phymode == IEEE80211_MODE_11AC_VHT40MINUS:
-	case phymode == IEEE80211_MODE_11AC_VHT40:
-	case phymode == IEEE80211_MODE_11AC_VHT80:
-		return AH_DCD_NMS_PHY_MODE_AC
-
-	case phymode == IEEE80211_MODE_11AX_2G_HE20:
-	case phymode == IEEE80211_MODE_11AX_2G_HE40:
-		return AH_DCD_NMS_PHY_MODE_AX_2G
-
-	case phymode == IEEE80211_MODE_11AX_5G_HE20:
-	case phymode == IEEE80211_MODE_11AX_5G_HE40:
-	case phymode == IEEE80211_MODE_11AX_5G_HE80:
-	case phymode == IEEE80211_MODE_11AX_5G_HE160:
-		return AH_DCD_NMS_PHY_MODE_AX_5G
-
-	case phymode == IEEE80211_MODE_11AX_6G_HE20:
-	case phymode == IEEE80211_MODE_11AX_6G_HE40:
-	case phymode == IEEE80211_MODE_11AX_6G_HE80:
-	case phymode == IEEE80211_MODE_11AX_6G_HE160:
-		return AH_DCD_NMS_PHY_MODE_AX_6G
-	default :
-		return AH_DCD_NMS_PHY_MODE_G
+    switch phymode{
+		case  IEEE80211_MODE_11A, IEEE80211_MODE_TURBO_A:
+			return AH_DCD_NMS_PHY_MODE_A
+
+		case IEEE80211_MODE_11B:
+			return AH_DCD_NMS_PHY_MODE_B
+
+		case IEEE80211_MODE_11NA_HT20, IEEE80211_MODE_11NA_HT40PLUS, IEEE80211_MODE_11NA_HT40MINUS, IEEE80211_MODE_11NA_HT40:
+			return AH_DCD_NMS_PHY_MODE_NA
+
+		case IEEE80211_MODE_11NG_HT20, IEEE80211_MODE_11NG_HT40PLUS, IEEE80211_MODE_11NG_HT40MINUS, IEEE80211_MODE_11NG_HT40:
+			return AH_DCD_NMS_PHY_MODE_NG
+
+		case  IEEE80211_MODE_11AC_VHT20, IEEE80211_MODE_11AC_VHT40PLUS, IEEE80211_MODE_11AC_VHT40MINUS, IEEE80211_MODE_11AC_VHT40, IEEE80211_MODE_11AC_VHT80:
+			return AH_DCD_NMS_PHY_MODE_AC
+
+		case IEEE80211_MODE_11AX_2G_HE20, IEEE80211_MODE_11AX_2G_HE40:
+			return AH_DCD_NMS_PHY_MODE_AX_2G
+
+		case IEEE80211_MODE_11AX_5G_HE20, IEEE80211_MODE_11AX_5G_HE40, IEEE80211_MODE_11AX_5G_HE80, IEEE80211_MODE_11AX_5G_HE160:
+			return AH_DCD_NMS_PHY_MODE_AX_5G
+
+		case IEEE80211_MODE_11AX_6G_HE20, IEEE80211_MODE_11AX_6G_HE40, IEEE80211_MODE_11AX_6G_HE80, IEEE80211_MODE_11AX_6G_HE160:
+			return AH_DCD_NMS_PHY_MODE_AX_6G
+
+		default :
+			return AH_DCD_NMS_PHY_MODE_G
     }
 
     return AH_DCD_NMS_PHY_MODE_G