X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fice%2Fbase%2Fice_switch.c;h=caa080da2507ce24055f46fd4976223b089c066b;hb=afa8eeffec6998d3313c36ed10484407ae594730;hp=0e220580a6232f49cb786ea9bc8e0a23638263b9;hpb=ff46ba738593306df86c7fed5988cd079df35a19;p=dpdk.git

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 0e220580a6..caa080da25 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -1086,15 +1086,11 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid)
 		tun_type = ICE_SW_TUN_PPPOE;
 	else if (!non_tun_valid && gtp_valid)
 		tun_type = ICE_SW_TUN_GTP;
-	else if ((non_tun_valid && vxlan_valid) ||
-		 (non_tun_valid && gre_valid) ||
-		 (non_tun_valid && gtp_valid) ||
-		 (non_tun_valid && pppoe_valid))
+	else if (non_tun_valid &&
+		 (vxlan_valid || gre_valid || gtp_valid || pppoe_valid))
 		tun_type = ICE_SW_TUN_AND_NON_TUN;
-	else if ((non_tun_valid && !vxlan_valid) ||
-		 (non_tun_valid && !gre_valid) ||
-		 (non_tun_valid && !gtp_valid) ||
-		 (non_tun_valid && !pppoe_valid))
+	else if (non_tun_valid && !vxlan_valid && !gre_valid && !gtp_valid &&
+		 !pppoe_valid)
 		tun_type = ICE_NON_TUN;
 
 	if (profile_num > 1 && tun_type == ICE_SW_TUN_PPPOE) {
@@ -1108,7 +1104,7 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid)
 			tun_type = ICE_SW_TUN_PPPOE_IPV6;
 	}
 
-	if (profile_num == 1 && (flag_valid || non_tun_valid)) {
+	if (profile_num == 1 && (flag_valid || non_tun_valid || pppoe_valid)) {
 		for (j = 0; j < ICE_MAX_NUM_PROFILES; j++) {
 			if (ice_is_bit_set(recipe_to_profile[rid], j)) {
 				switch (j) {