d761fec5f6
- Applied all the fixes recommended by upstream for v2.2 stable release(bsc#981996). [+0008-app-testpmd-handle-SIGINT-and-SIGTERM.patch, +0009-bonding-copy-entire-config-structure-in-mode-4.patch, +0010-bonding-fix-active-slaves-with-no-primary.patch, +0011-bonding-do-not-ignore-multicast-in-mode-4.patch, +0012-bonding-do-not-activate-slave-twice.patch, +0013-bonding-fix-crash-when-no-slave-device.patch, +0014-bonding-fix-detach-of-bonded-device.patch, +0015-bonding-fix-detach-of-slave-devices.patch, +0016-eal-linux-support-built-in-kernel-modules.patch, +0017-examples-l3fwd-handle-SIGINT-and-SIGTERM.patch, +0018-fm10k-fix-VLAN-flag-in-scattered-Rx.patch, +0019-i40e-base-fix-driver-load-failure.patch, +0020-i40e-base-fix-missing-check-for-stopped-admin-queue.patch, +0021-i40e-fix-inverted-check-for-no-refcount.patch, +0022-i40e-fix-overflow.patch, +0023-i40e-fix-VLAN-filtering.patch, +0024-mempool-fix-leak-when-creation-fails.patch, +0025-pcap-fix-captured-frame-length.patch, +0026-port-fix-crash-for-ethdev-writer-nodrop.patch, +0027-port-fix-crash-for-ring-writer-nodrop.patch, +0028-tools-fix-unbinding-failure-handling.patch, +0029-tools-support-Python-3-in-bind-script.patch, +0030-tools-support-binding-to-built-in-kernel-modules.patch, +0031-vhost-fix-leak-of-fds-and-mmaps.patch, +0032-virtio-fix-crash-in-statistics-functions.patch, +0033-virtio-fix-descriptors-pointing-to-the-same-buffer.patch, +0034-virtio-fix-restart.patch] OBS-URL: https://build.opensuse.org/request/show/399089 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=3
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
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.6.2
|
|
|