Revert "Integrate interface.api changes to 3.0.0 to sweetcomb"

This reverts commit 4157d85b570d5da6af042758813712ae04573c8f.

Change-Id: I5637ad3e994dcc63d1acd9d1f9729c0dbd2acbf4
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/src/scvpp/src/sc_vpp_ip.c b/src/scvpp/src/sc_vpp_ip.c
index 8307090..77e79fb 100644
--- a/src/scvpp/src/sc_vpp_ip.c
+++ b/src/scvpp/src/sc_vpp_ip.c
@@ -41,16 +41,11 @@ bin_api_sw_interface_add_del_address(u32 sw_if_index, bool is_add, bool is_ipv6,
 
     mp->payload.sw_if_index = sw_if_index;
     mp->payload.is_add = is_add;
+    mp->payload.is_ipv6 = is_ipv6;
     mp->payload.del_all = del_all;
-
-    mp->payload.prefix.address_length = address_length;
-    if (is_ipv6) {
-        mp->payload.prefix.address.af = ADDRESS_IP6;
-        sc_aton(ip_address, mp->payload.prefix.address.un.ip4, VPP_IP4_ADDRESS_LEN);
-    } else {
-        mp->payload.prefix.address.af = ADDRESS_IP4;
-        sc_aton(ip_address, mp->payload.prefix.address.un.ip6, VPP_IP6_ADDRESS_LEN);
-    }
+    mp->payload.address_length = address_length;
+    if (sc_aton(ip_address, mp->payload.address, sizeof(mp->payload.address)))
+        return VAPI_EINVAL;
 
     VAPI_CALL(vapi_sw_interface_add_del_address(g_vapi_ctx_instance, mp,
                                         sw_interface_add_del_address_cb, NULL));