diff options
author | Ben Pfaff <blp@ovn.org> | 2017-08-07 10:03:24 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2017-08-07 10:04:58 -0700 |
commit | a59ea79baa4cd05ca88f5952087ffda0470c7f5f (patch) | |
tree | 1653b00045d05e207f0460026da12b332c999c44 /lib/netdev-vport.c | |
parent | 90cef12cf0376be33029d8da0c66f8b0be4829fd (diff) | |
download | openvswitch-a59ea79baa4cd05ca88f5952087ffda0470c7f5f.tar.gz |
Revert "netdev-vport: Always implement get_ifindex for netdev-vport"
This reverts commit 327d98eb197bf04da90e23c03d88093a6eeeb6f3,
which several unit tests to fail due to new warning messages in
the logs.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'lib/netdev-vport.c')
-rw-r--r-- | lib/netdev-vport.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index d11c5ccdd..64a3ba3c4 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -857,7 +857,7 @@ 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)); @@ -865,6 +865,15 @@ netdev_vport_get_ifindex(const struct netdev *netdev_) 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__ */ |