net/ice: remove GTPU tunnel support for inner L4
authorYahui Cao <yahui.cao@intel.com>
Thu, 31 Oct 2019 13:05:38 +0000 (21:05 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 8 Nov 2019 22:15:04 +0000 (23:15 +0100)
The current code doesn't support L4 matching, it only supports L3
matching so remove the code for inner L4.

Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel")

Signed-off-by: Yahui Cao <yahui.cao@intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
drivers/net/ice/ice_fdir_filter.c

index 9389b1f..fbbc41f 100644 (file)
 #define ICE_FDIR_INSET_GTPU_IPV4 (\
        ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)
 
-#define ICE_FDIR_INSET_GTPU_IPV4_TCP (\
-       ICE_FDIR_INSET_GTPU_IPV4)
-
-#define ICE_FDIR_INSET_GTPU_IPV4_UDP (\
-       ICE_FDIR_INSET_GTPU_IPV4)
-
-#define ICE_FDIR_INSET_GTPU_IPV4_UDP (\
-       ICE_FDIR_INSET_GTPU_IPV4)
-
 static struct ice_pattern_match_item ice_fdir_pattern_os[] = {
        {pattern_eth_ipv4,             ICE_FDIR_INSET_ETH_IPV4,              ICE_INSET_NONE},
        {pattern_eth_ipv4_udp,         ICE_FDIR_INSET_ETH_IPV4_UDP,          ICE_INSET_NONE},
@@ -128,10 +119,6 @@ static struct ice_pattern_match_item ice_fdir_pattern_comms[] = {
        {pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,
                                       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},
        {pattern_eth_ipv4_gtpu_ipv4,   ICE_FDIR_INSET_GTPU_IPV4,             ICE_INSET_NONE},
-       {pattern_eth_ipv4_gtpu_ipv4_tcp,
-                                      ICE_FDIR_INSET_GTPU_IPV4,             ICE_INSET_NONE},
-       {pattern_eth_ipv4_gtpu_ipv4_udp,
-                                      ICE_FDIR_INSET_GTPU_IPV4,             ICE_INSET_NONE},
 };
 
 static struct ice_flow_parser ice_fdir_parser_os;