net/ice: fix RSS type checking

For pattern MAC_PPPOE_IPV4/6, add ETH_RSS_ETH into input_set_mask
to fix RSS rule cannot be created when set eth as RSS type.

Fixes: 0d84f86c3022 ("net/ice: fix GTPU header parsing")

Signed-off-by: Xuan Ding <xuan.ding@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 8792e44..81caf6c 100644 (file)
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -424,24 +424,24 @@ struct ice_rss_hash_cfg empty_tmplt = {
 #define ICE_RSS_TYPE_GTPU_IPV6_TCP     (ICE_RSS_TYPE_INNER_IPV6_TCP | \
                                         ETH_RSS_GTPU)
 
+/* PPPOE */
+#define ICE_RSS_TYPE_PPPOE             (ETH_RSS_ETH | ETH_RSS_PPPOE)
+
 /* PPPOE IPv4 */
 #define ICE_RSS_TYPE_PPPOE_IPV4                (ICE_RSS_TYPE_INNER_IPV4 | \
-                                        ETH_RSS_PPPOE)
+                                        ICE_RSS_TYPE_PPPOE)
 #define ICE_RSS_TYPE_PPPOE_IPV4_UDP    (ICE_RSS_TYPE_INNER_IPV4_UDP | \
-                                        ETH_RSS_PPPOE)
+                                        ICE_RSS_TYPE_PPPOE)
 #define ICE_RSS_TYPE_PPPOE_IPV4_TCP    (ICE_RSS_TYPE_INNER_IPV4_TCP | \
-                                        ETH_RSS_PPPOE)
+                                        ICE_RSS_TYPE_PPPOE)
 
 /* PPPOE IPv6 */
 #define ICE_RSS_TYPE_PPPOE_IPV6                (ICE_RSS_TYPE_INNER_IPV6 | \
-                                        ETH_RSS_PPPOE)
+                                        ICE_RSS_TYPE_PPPOE)
 #define ICE_RSS_TYPE_PPPOE_IPV6_UDP    (ICE_RSS_TYPE_INNER_IPV6_UDP | \
-                                        ETH_RSS_PPPOE)
+                                        ICE_RSS_TYPE_PPPOE)
 #define ICE_RSS_TYPE_PPPOE_IPV6_TCP    (ICE_RSS_TYPE_INNER_IPV6_TCP | \
-                                        ETH_RSS_PPPOE)
-
-/* PPPOE*/
-#define ICE_RSS_TYPE_PPPOE             (ETH_RSS_ETH | ETH_RSS_PPPOE)
+                                        ICE_RSS_TYPE_PPPOE)
 
 /* ESP, AH, L2TPV3 and PFCP */
 #define ICE_RSS_TYPE_IPV4_ESP          (ETH_RSS_ESP | ETH_RSS_IPV4)