Revert "netdev-vport: Always implement get_ifindex for netdev-vport"

This reverts commit 327d98e, which several unit tests to fail due to new warning messages in the logs. Signed-off-by: Ben Pfaff <[email protected]>
timofei-durakov · Aug 7, 2017 · a59ea79 · a59ea79
1 parent 90cef12
commit a59ea79
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
@@ -857,14 +857,23 @@ get_pt_mode(const struct netdev *netdev)
 
 #ifdef __linux__
 static int
-netdev_vport_get_ifindex(const struct netdev *netdev_)
+netdev_vport_get_ifindex__(const struct netdev *netdev_)
 {
     char buf[NETDEV_VPORT_NAME_BUFSIZE];
     const char *name = netdev_vport_get_dpif_port(netdev_, buf, sizeof(buf));
 
     return linux_get_ifindex(name);
 }
 
+static int
+netdev_vport_get_ifindex(const struct netdev *netdev_)
+{
+    if (netdev_is_flow_api_enabled())
+        return netdev_vport_get_ifindex__(netdev_);
+    else
+        return -EOPNOTSUPP;
+}
+
 #define NETDEV_VPORT_GET_IFINDEX netdev_vport_get_ifindex
 #define NETDEV_FLOW_OFFLOAD_API LINUX_FLOW_OFFLOAD_API
 #else /* !__linux__ */