net/ice: fix eth rss type checking

Message ID 20210201045302.55059-1-xuan.ding@intel.com (mailing list archive)
State Superseded, archived
Headers
Series net/ice: fix eth rss type checking |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS

Commit Message

Ding, Xuan Feb. 1, 2021, 4:53 a.m. UTC
  For pattern MAC_PPPOE_IPV4/6, add ETH_RSS_ETH into insput_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>
---
 drivers/net/ice/ice_hash.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
  

Patch

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index aee4761625..ff0c55b4da 100644
--- 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)