diff options
| author |   Neale Ranns <nranns@cisco.com> | 2016-12-20 14:24:01 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-12-20 19:10:06 +0000 |
| commit | 3be6b2845485d8740410293322c8b4bf373878e7 (patch) | |
| tree | 2c456eb76f63cd04d9fd8bd11df28cd7565763b9 /vnet/vnet/interface.c | |
| parent | fdf494439b04d3a498aa488f0b407c1a2346262f (diff) | |
Decouple dependencies/assumptions in MAC change
Change-Id: Ic38d0e468da1ad5b56eefda471a5961146a1c372
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'vnet/vnet/interface.c')
| -rw-r--r-- | vnet/vnet/interface.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/vnet/vnet/interface.c b/vnet/vnet/interface.c index b72dcd41f46..78610ed460b 100644 --- a/vnet/vnet/interface.c +++ b/vnet/vnet/interface.c @@ -1311,25 +1311,16 @@ vnet_hw_interface_change_mac_address_helper (vnet_main_t * vnm, if (dev_class->mac_addr_change_function) { error = - dev_class->mac_addr_change_function (vnet_get_hw_interface - (vnm, hw_if_index), - (char *) &mac_address); + dev_class->mac_addr_change_function (hi, (char *) &mac_address); } if (!error) { - ethernet_main_t *em = ðernet_main; - ethernet_interface_t *ei = - pool_elt_at_index (em->interfaces, hi->hw_instance); - - vec_validate (hi->hw_address, - STRUCT_SIZE_OF (ethernet_header_t, src_address) - 1); - clib_memcpy (hi->hw_address, &mac_address, - vec_len (hi->hw_address)); - - clib_memcpy (ei->address, (u8 *) & mac_address, - sizeof (ei->address)); - ethernet_arp_change_mac (vnm, hw_if_index); - ethernet_ndp_change_mac (vnm->vlib_main, hw_if_index); + vnet_hw_interface_class_t *hw_class; + + hw_class = vnet_get_hw_interface_class (vnm, hi->hw_class_index); + + if (NULL != hw_class->mac_addr_change_function) + hw_class->mac_addr_change_function (hi, (char *) &mac_address); } else { |