From: Milan Lenco <milan.lenco@pantheon.tech>
Date: Wed, 19 Apr 2017 08:34:53 +0000 (+0200)
Subject: Temporary workaround for the bug VPP-698.
X-Git-Tag: v17.07-rc1~305
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=f1ff5ff1049fd2750823273a3a92779e5fd6e1a5;p=vpp.git

Temporary workaround for the bug VPP-698.

Change-Id: I220b0b95449f24cc547206e38ab8e10019115ec0
Signed-off-by: Milan Lenco <milan.lenco@pantheon.tech>
---

diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c
index dc7ddd8a3c5..98d31eb0453 100644
--- a/src/plugins/memif/memif.c
+++ b/src/plugins/memif/memif.c
@@ -368,7 +368,7 @@ memif_conn_fd_read_ready (unix_file_t * uf)
 	  else if (cmsg->cmsg_level == SOL_SOCKET
 		   && cmsg->cmsg_type == SCM_RIGHTS)
 	    {
-	      clib_memcpy (fd_array, CMSG_DATA (cmsg), sizeof (fd_array));
+	      memcpy (fd_array, CMSG_DATA (cmsg), sizeof (fd_array));
 	    }
 	  cmsg = CMSG_NXTHDR (&mh, cmsg);
 	}
@@ -573,7 +573,7 @@ memif_connect_master (vlib_main_t * vm, memif_if_t * mif)
   cmsg->cmsg_level = SOL_SOCKET;
   cmsg->cmsg_type = SCM_RIGHTS;
   fd_array[0] = mfd;
-  clib_memcpy (CMSG_DATA (cmsg), fd_array, sizeof (fd_array));
+  memcpy (CMSG_DATA (cmsg), fd_array, sizeof (fd_array));
 
   mif->flags |= MEMIF_IF_FLAG_CONNECTING;
   rv = sendmsg (mif->connection.fd, &mh, 0);