diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index 28d60ec..67ad874 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -53309,7 +53309,7 @@ index 620a451dec..5aa8a8ca3c 100644
      ofpbuf_uninit(&request);
      if (error) {
 diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
-index 94dc6a9b74..be6adc32ff 100644
+index 94dc6a9b74..303b99daf4 100644
 --- a/lib/netdev-offload-dpdk.c
 +++ b/lib/netdev-offload-dpdk.c
 @@ -18,6 +18,7 @@
@@ -53339,7 +53339,30 @@ index 94dc6a9b74..be6adc32ff 100644
          }
          ds_put_cstr(s, "/ ");
      } else if (item->type == RTE_FLOW_ITEM_TYPE_VLAN) {
-@@ -1369,6 +1375,7 @@ parse_flow_match(struct netdev *netdev,
+@@ -1092,12 +1098,18 @@ vport_to_rte_tunnel(struct netdev *vport,
+     const struct netdev_tunnel_config *tnl_cfg;
+ 
+     memset(tunnel, 0, sizeof *tunnel);
++
++    tnl_cfg = netdev_get_tunnel_config(vport);
++    if (!tnl_cfg) {
++        return -1;
++    }
++
++    if (!IN6_IS_ADDR_V4MAPPED(&tnl_cfg->ipv6_dst)) {
++        tunnel->is_ipv6 = true;
++    }
++
+     if (!strcmp(netdev_get_type(vport), "vxlan")) {
+         tunnel->type = RTE_FLOW_ITEM_TYPE_VXLAN;
+-        tnl_cfg = netdev_get_tunnel_config(vport);
+-        if (!tnl_cfg) {
+-            return -1;
+-        }
+         tunnel->tp_dst = tnl_cfg->dst_port;
+         if (!VLOG_DROP_DBG(&rl)) {
+             ds_put_format(s_tnl, "flow tunnel create %d type vxlan; ",
+@@ -1369,6 +1381,7 @@ parse_flow_match(struct netdev *netdev,
                   struct flow_patterns *patterns,
                   struct match *match)
  {
@@ -53347,7 +53370,7 @@ index 94dc6a9b74..be6adc32ff 100644
      struct flow *consumed_masks;
      uint8_t proto = 0;
  
-@@ -1414,6 +1421,11 @@ parse_flow_match(struct netdev *netdev,
+@@ -1414,6 +1427,11 @@ parse_flow_match(struct netdev *netdev,
          memset(&consumed_masks->dl_src, 0, sizeof consumed_masks->dl_src);
          consumed_masks->dl_type = 0;
  
@@ -53359,7 +53382,7 @@ index 94dc6a9b74..be6adc32ff 100644
          add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_ETH, spec, mask, NULL);
      }
  
-@@ -1427,8 +1439,14 @@ parse_flow_match(struct netdev *netdev,
+@@ -1427,8 +1445,14 @@ parse_flow_match(struct netdev *netdev,
          spec->tci = match->flow.vlans[0].tci & ~htons(VLAN_CFI);
          mask->tci = match->wc.masks.vlans[0].tci & ~htons(VLAN_CFI);
  
@@ -53376,7 +53399,7 @@ index 94dc6a9b74..be6adc32ff 100644
  
          add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_VLAN, spec, mask, NULL);
      }
-@@ -1697,7 +1715,7 @@ add_flow_mark_rss_actions(struct flow_actions *actions,
+@@ -1697,7 +1721,7 @@ add_flow_mark_rss_actions(struct flow_actions *actions,
          .conf = (struct rte_flow_action_rss) {
              .func = RTE_ETH_HASH_FUNCTION_DEFAULT,
              .level = 0,
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index 082f2f9..72e0e28 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 63%{?dist}
+Release: 64%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -743,6 +743,12 @@ exit 0
 %endif
 
 %changelog
+* Mon Nov 14 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-64
+- Merging upstream branch-2.17 [RH git: 6214c5363d]
+    Commit list:
+    ee0e1d0a51 netdev-offload-dpdk: Enhance the support of tunnel pop action
+
+
 * Sat Nov 05 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-63
 - Merging upstream branch-2.17 [RH git: 209d631f40]
     Commit list: