diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch
index 2039a47..24669d6 100644
--- a/SOURCES/openvswitch-2.11.3.patch
+++ b/SOURCES/openvswitch-2.11.3.patch
@@ -17312,6 +17312,35 @@ index 808a43f99d..550fbe4722 100644
            },
            {{NULL, NULL, 0, 0}}
          },
+diff --git a/lib/netdev-windows.c b/lib/netdev-windows.c
+index 4ad45ffa1b..3fad501e3e 100644
+--- a/lib/netdev-windows.c
++++ b/lib/netdev-windows.c
+@@ -156,6 +156,7 @@ netdev_windows_system_construct(struct netdev *netdev_)
+     struct netdev_windows_netdev_info info;
+     struct ofpbuf *buf;
+     int ret;
++    const char    *type = NULL;
+ 
+     /* Query the attributes and runtime status of the netdev. */
+     ret = query_netdev(netdev_get_name(&netdev->up), &info, &buf);
+@@ -167,6 +168,16 @@ netdev_windows_system_construct(struct netdev *netdev_)
+     }
+     ofpbuf_delete(buf);
+ 
++    /* Don't create netdev if ovs-type is "internal"
++     * but the type of netdev->up is "system". */
++    type = netdev_get_type(&netdev->up);
++    if (type && !strcmp(type, "system") &&
++        (info.ovs_type == OVS_VPORT_TYPE_INTERNAL)) {
++        VLOG_DBG("construct device %s, ovs_type: %u failed",
++                 netdev_get_name(&netdev->up), info.ovs_type);
++        return 1;
++    }
++
+     netdev->change_seq = 1;
+     netdev->dev_type = info.ovs_type;
+     netdev->port_no = info.port_no;
 diff --git a/lib/netdev.h b/lib/netdev.h
 index d94817fb62..2d2d6f3a60 100644
 --- a/lib/netdev.h
diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec
index a0b8dc3..25335a7 100644
--- a/SPECS/openvswitch2.11.spec
+++ b/SPECS/openvswitch2.11.spec
@@ -66,7 +66,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.11.3
-Release: 94%{?dist}
+Release: 95%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -747,6 +747,12 @@ exit 0
 
 
 %changelog
+* Tue Mar 07 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.11.3-95
+- Merging upstream branch-2.11 [RH gerrit: de655ff389]
+    Commit list:
+    7432750761 netdev-windows: Add checking when creating netdev with system type on Windows
+
+
 * Thu Apr 21 2022 Timothy Redaelli <tredaelli@redhat.com> - 2.11.3-94
 - redhat: use hugetlbfs group for /var/log/openvswitch when dpdk is enabled [RH git: 132f9642d3] (#2024728)
     Resolves: #2024728