From c595fda55bfed9753851de5675aa310f523564b3 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 21 Dec 2007 09:37:30 -0800
Subject: [PATCH] veth: use kernel header file

Use santized kernel header for veth.h and put in correct place
to prevent possible future problems with API.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
---
 {ip => include/net}/veth.h |  4 ++--
 ip/link_veth.c             | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename {ip => include/net}/veth.h (71%)

diff --git a/ip/veth.h b/include/net/veth.h
similarity index 71%
rename from ip/veth.h
rename to include/net/veth.h
index aa2e6f91..3354c1eb 100644
--- a/ip/veth.h
+++ b/include/net/veth.h
@@ -1,5 +1,5 @@
-#ifndef __NET_VETH_H__
-#define __NET_VETH_H__
+#ifndef __NET_VETH_H_
+#define __NET_VETH_H_
 
 enum {
 	VETH_INFO_UNSPEC,
diff --git a/ip/link_veth.c b/ip/link_veth.c
index 226b4ef4..9dfb78f6 100644
--- a/ip/link_veth.c
+++ b/ip/link_veth.c
@@ -11,22 +11,21 @@
  */
 
 #include <string.h>
+#include <net/if.h>
+#include <net/veth.h>
 
 #include "utils.h"
 #include "ip_common.h"
-#include "veth.h"
-
-#define	IFNAMSIZ	16
 
 static void usage(void)
 {
 	printf("Usage: ip link <options> type veth "
-		"[peer <options>]\nTo get <options> type "
-		"'ip link add help'\n");
+	       "[peer <options>]\nTo get <options> type "
+	       "'ip link add help'\n");
 }
 
 static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
-		struct nlmsghdr *hdr)
+			  struct nlmsghdr *hdr)
 {
 	char *name, *type, *link, *dev;
 	int err, len;
@@ -43,7 +42,7 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
 	hdr->nlmsg_len += sizeof(struct ifinfomsg);
 
 	err = iplink_parse(argc - 1, argv + 1, (struct iplink_req *)hdr,
-			&name, &type, &link, &dev);
+			   &name, &type, &link, &dev);
 	if (err < 0)
 		return err;