From: John Lo Date: Fri, 26 Feb 2016 19:46:05 +0000 (-0500) Subject: Fix link bonding PMD slave status polling path used by VIC ENIC driver. X-Git-Tag: v16.06-rc1~284 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a0fac5ac194d99dc32d1474520b5be7f9628fabb;p=vpp.git Fix link bonding PMD slave status polling path used by VIC ENIC driver. Change-Id: Ic9fc952b618477beb246974b33d753bf6fd47dde Signed-off-by: John Lo --- diff --git a/dpdk/dpdk-2.2.0_patches/0011-Fix-link-bonding-PMD-slave-status-polling-path-used-.patch b/dpdk/dpdk-2.2.0_patches/0011-Fix-link-bonding-PMD-slave-status-polling-path-used-.patch new file mode 100644 index 00000000000..210ee458ba4 --- /dev/null +++ b/dpdk/dpdk-2.2.0_patches/0011-Fix-link-bonding-PMD-slave-status-polling-path-used-.patch @@ -0,0 +1,34 @@ +From 39272e0a1c227b1ab9360e6fbcbc497eaaed4cb0 Mon Sep 17 00:00:00 2001 +From: John Lo +Date: Fri, 26 Feb 2016 12:45:55 -0500 +Subject: [PATCH 1/2] Fix link bonding PMD slave status polling path used by + ENIC driver, + +--- + drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c +index b1373c6..9efd73c 100644 +--- a/drivers/net/bonding/rte_eth_bond_pmd.c ++++ b/drivers/net/bonding/rte_eth_bond_pmd.c +@@ -1734,7 +1734,7 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg) + + if (!bonded_ethdev->data->dev_started || + !internals->link_status_polling_enabled) +- return; ++ goto rearm_and_exit; + + /* If device is currently being configured then don't check slaves link + * status, wait until next period */ +@@ -1768,6 +1768,7 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg) + rte_spinlock_unlock(&internals->lock); + } + ++ rearm_and_exit: + if (polling_slave_found) + /* Set alarm to continue monitoring link status of slave ethdev's */ + rte_eal_alarm_set(internals->link_status_polling_interval_ms * 1000, +-- +1.9.1 +