41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
Description: backport of dpdk 16.04-rc1 fix for LP: #1559981
|
|
|
|
Forwarded: n/a (already upstream)
|
|
Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
|
Last-Update: 2016-03-20
|
|
|
|
From 786c990a11e6e6592dfdee02840877070aa3a79a Mon Sep 17 00:00:00 2001
|
|
From: Eric Kinzie <ekinzie@brocade.com>
|
|
Date: Tue, 1 Mar 2016 09:31:59 -0800
|
|
Subject: [PATCH] bonding: copy entire config structure in mode 4
|
|
|
|
Copy all needed fields from the mode8023ad_private structure in
|
|
bond_mode_8023ad_conf_get(). This help ensure that a subsequent call
|
|
to rte_eth_bond_8023ad_setup() is not passed uninitialized data that
|
|
would result in either incorrect behavior or a failed sanity check.
|
|
|
|
Fixes: 46fb43683679 ("bond: add mode 4")
|
|
|
|
Signed-off-by: Eric Kinzie <ekinzie@brocade.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
Acked-by: Declan Doherty <declan.doherty@intel.com>
|
|
---
|
|
drivers/net/bonding/rte_eth_bond_8023ad.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
|
|
index b3b30f6..1b7e93a 100644
|
|
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
|
|
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
|
|
@@ -1019,6 +1019,7 @@ bond_mode_8023ad_conf_get(struct rte_eth_dev *dev,
|
|
conf->aggregate_wait_timeout_ms = mode4->aggregate_wait_timeout / ms_ticks;
|
|
conf->tx_period_ms = mode4->tx_period_timeout / ms_ticks;
|
|
conf->update_timeout_ms = mode4->update_timeout_us / 1000;
|
|
+ conf->rx_marker_period_ms = mode4->rx_marker_timeout / ms_ticks;
|
|
}
|
|
|
|
void
|
|
--
|
|
2.7.3
|
|
|