Move fields order

ntop · Jan 7, 2025 · d12d913 · d12d913
1 parent 30acdc6
commit d12d913
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/drivers/intel/ice/ice-1.12.7-zc/src/ice_ethtool.c b/drivers/intel/ice/ice-1.12.7-zc/src/ice_ethtool.c
@@ -3981,18 +3981,20 @@ static u64 ice_parse_hash_flds(struct ethtool_rxnfc *nfc)
 	u64 hfld = ICE_HASH_INVALID;
 
 #ifdef HAVE_PF_RING
-	if (nfc->data & RXH_L2DA) {
-	        hfld |= ICE_FLOW_HASH_FLD_ETH_SA; /* Source MAC Addr */
-	        hfld |= ICE_FLOW_HASH_FLD_ETH_DA; /* Destination MAC Addr */
+	if (pppoe_rss) {
+		hfld |= ICE_FLOW_HASH_FLD_ETH_SA; /* Source MAC Addr */
+		hfld |= ICE_FLOW_HASH_FLD_PPPOE_SESS_ID; /* PPPoE Session ID */
+		return hfld;
 	}
 
-	if (nfc->data & RXH_VLAN) {
-	        hfld |= ICE_FLOW_HASH_FLD_S_VLAN; /* Source VLAN */
-	        hfld |= ICE_FLOW_HASH_FLD_C_VLAN; /* QinQ */
+	if (nfc->data & RXH_L2DA) {
+		hfld |= ICE_FLOW_HASH_FLD_ETH_SA; /* Source MAC Addr */
+		hfld |= ICE_FLOW_HASH_FLD_ETH_DA; /* Destination MAC Addr */
 	}
 
-	if (pppoe_rss) {
-		hfld |= ICE_FLOW_HASH_FLD_PPPOE_SESS_ID; /* PPPoE Session ID */
+	if (nfc->data & RXH_VLAN) {
+		hfld |= ICE_FLOW_HASH_FLD_S_VLAN; /* Source VLAN */
+		hfld |= ICE_FLOW_HASH_FLD_C_VLAN; /* QinQ */
 	}
 #endif