1 files changed, 2 insertions, 76 deletions

diff --git a/src/vnet/devices/virtio/tap.c b/src/vnet/devices/virtio/tap.c
index 658ba6bfc68..f6db2c90616 100644
--- a/src/vnet/devices/virtio/tap.c
+++ b/src/vnet/devices/virtio/tap.c
@@ -31,6 +31,7 @@
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/netlink.h>
 #include <vnet/devices/virtio/virtio.h>
 #include <vnet/devices/virtio/tap.h>
 
@@ -49,81 +50,6 @@ virtio_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
   return 0;
 }
 
-
-clib_error_t *
-clib_netlink_set_if_attr (int ifindex, unsigned short rta_type, void *data,
-			  int data_len)
-{
-  clib_error_t *err = 0;
-  int sock;
-  struct sockaddr_nl ra = { 0 };
-  struct
-  {
-    struct nlmsghdr nh;
-    struct ifinfomsg ifmsg;
-    char attrbuf[512];
-  } req;
-  struct rtattr *rta;
-
-  memset (&req, 0, sizeof (req));
-  if ((sock = socket (AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) == -1)
-    {
-      err = clib_error_return_unix (0, "socket(AF_NETLINK)");
-      goto error;
-    }
-
-  ra.nl_family = AF_NETLINK;
-  ra.nl_pid = getpid ();
-
-  if ((bind (sock, (struct sockaddr *) &ra, sizeof (ra))) == -1)
-    return clib_error_return_unix (0, "bind");
-
-  req.nh.nlmsg_len = NLMSG_LENGTH (sizeof (struct ifinfomsg));
-  req.nh.nlmsg_flags = NLM_F_REQUEST;
-  req.nh.nlmsg_type = RTM_SETLINK;
-  req.ifmsg.ifi_family = AF_UNSPEC;
-  req.ifmsg.ifi_index = ifindex;
-  req.ifmsg.ifi_change = 0xffffffff;
-  rta = (struct rtattr *) (((char *) &req) + NLMSG_ALIGN (req.nh.nlmsg_len));
-  rta->rta_type = rta_type;
-  rta->rta_len = RTA_LENGTH (data_len);
-  req.nh.nlmsg_len = NLMSG_ALIGN (req.nh.nlmsg_len) + RTA_LENGTH (data_len);
-  memcpy (RTA_DATA (rta), data, data_len);
-
-  if ((send (sock, &req, req.nh.nlmsg_len, 0)) == -1)
-    err = clib_error_return_unix (0, "send");
-
-error:
-  return err;
-}
-
-clib_error_t *
-clib_netlink_set_if_mtu (int ifindex, int mtu)
-{
-  clib_error_t *err;
-
-  err = clib_netlink_set_if_attr (ifindex, IFLA_MTU, &mtu, sizeof (int));
-  return err;
-}
-
-clib_error_t *
-clib_netlink_set_if_namespace (int ifindex, char *net_ns)
-{
-  clib_error_t *err;
-  int ns_fd;
-  u8 *s;
-  s = format (0, "/var/run/netns/%s%c", net_ns, 0);
-  ns_fd = open ((char *) s, O_RDONLY);
-  vec_free (s);
-  if (ns_fd == -1)
-    return clib_error_return (0, "namespace '%s' doesn't exist", net_ns);
-
-  err =
-    clib_netlink_set_if_attr (ifindex, IFLA_NET_NS_FD, &ns_fd, sizeof (int));
-  close (ns_fd);
-  return err;
-}
-
 int
 tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
 {
@@ -196,7 +122,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
 
   if (args->net_ns)
     {
-      err = clib_netlink_set_if_namespace (vif->ifindex,
+      err = vnet_netlink_set_if_namespace (vif->ifindex,
 					   (char *) args->net_ns);
       if (err)
 	{