From 0a69734dfe9ea35e3983f0c6a71e7853037adb74 Mon Sep 17 00:00:00 2001 From: John Lo Date: Mon, 15 May 2017 19:21:15 -0400 Subject: [PATCH] Fix regression of setting device to admin-down state Change-Id: I0ffa572839405efe1170d6ddb073e53e9af02db7 Signed-off-by: John Lo --- src/plugins/dpdk/device/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index 6a0b1acf6c1..c68ecbda246 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -618,22 +618,21 @@ dpdk_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) if (is_up) { - f64 now = vlib_time_now (dm->vlib_main); - + vnet_hw_interface_set_flags (vnm, xd->hw_if_index, + VNET_HW_INTERFACE_FLAG_LINK_UP); if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) == 0) dpdk_device_start (xd); - xd->flags |= DPDK_DEVICE_FLAG_ADMIN_UP; + f64 now = vlib_time_now (dm->vlib_main); dpdk_update_counters (xd, now); dpdk_update_link_state (xd, now); } else { - xd->flags &= ~DPDK_DEVICE_FLAG_ADMIN_UP; vnet_hw_interface_set_flags (vnm, xd->hw_if_index, 0); - if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) != 0) dpdk_device_stop (xd); + xd->flags &= ~DPDK_DEVICE_FLAG_ADMIN_UP; } return /* no error */ 0; -- 2.16.6