diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-05-10 20:26:36 +0200 |
|---|---|---|
| committer |   John Lo <loj@cisco.com> | 2018-05-11 07:04:00 +0000 |
| commit | a8ab568f84e78ad5b2b356a5cca7fa57acb9eeb5 (patch) | |
| tree | 92bd371cf71f8526dcebf541bd96c37b74192583 | |
| parent | 7895872981c6c5a146f76ce7a35ce7350b21f72f (diff) | |
Fix issue with xconnect not working on the main interface
Due to union, l2 sub-interface bits were wrongly set
causing sporadic misconfiguration of l2 mode on some
interfaces.
Change-Id: Id77ee281e3a0030878641a786c22ffe16ce1c759
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | src/vnet/interface.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/vnet/interface.h b/src/vnet/interface.h index 6eaf50166c0..87addbe67be 100644 --- a/src/vnet/interface.h +++ b/src/vnet/interface.h @@ -681,17 +681,14 @@ typedef struct u32 link_speed; - union - { - /* VNET_SW_INTERFACE_TYPE_HARDWARE. */ - u32 hw_if_index; + /* VNET_SW_INTERFACE_TYPE_HARDWARE. */ + u32 hw_if_index; - /* VNET_SW_INTERFACE_TYPE_SUB. */ - vnet_sub_interface_t sub; + /* VNET_SW_INTERFACE_TYPE_SUB. */ + vnet_sub_interface_t sub; - /* VNET_SW_INTERFACE_TYPE_P2P. */ - vnet_p2p_sub_interface_t p2p; - }; + /* VNET_SW_INTERFACE_TYPE_P2P. */ + vnet_p2p_sub_interface_t p2p; vnet_flood_class_t flood_class; } vnet_sw_interface_t; |