ping: remove local stub header in favour of system include file

The words 'we cannot use "linux/in6.h" immediately' originate to commit
fed7e6306f37a18 from November 2012, that does not seem to be accurate
anymore.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

2 files changed, 1 insertions, 41 deletions

diff --git a/in6_flowlabel.h b/in6_flowlabel.h
deleted file mode 100644
index dcb118d..0000000
--- a/in6_flowlabel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-   It is just a stripped copy of the kernel header "linux/in6.h"
-
-   "Flow label" things are still not defined in "netinet/in*.h" headers,
-   but we cannot use "linux/in6.h" immediately because it currently
-   conflicts with "netinet/in.h" .
-*/
-
-struct in6_flowlabel_req
-{
-	struct in6_addr	flr_dst;
-	uint32_t	flr_label;
-	uint8_t		flr_action;
-	uint8_t		flr_share;
-	uint16_t	flr_flags;
-	uint16_t 	flr_expires;
-	uint16_t	flr_linger;
-	uint32_t	__flr_pad;
-	/* Options in format of IPV6_PKTOPTIONS */
-};
-
-#define IPV6_FL_A_GET	0
-#define IPV6_FL_A_PUT	1
-#define IPV6_FL_A_RENEW	2
-
-#define IPV6_FL_F_CREATE	1
-#define IPV6_FL_F_EXCL		2
-
-#define IPV6_FL_S_NONE		0
-#define IPV6_FL_S_EXCL		1
-#define IPV6_FL_S_PROCESS	2
-#define IPV6_FL_S_USER		3
-#define IPV6_FL_S_ANY		255
-
-#define IPV6_FLOWINFO_FLOWLABEL		0x000fffff
-#define IPV6_FLOWINFO_PRIORITY		0x0ff00000
-
-#define IPV6_FLOWLABEL_MGR	32
-#define IPV6_FLOWINFO_SEND	33
diff --git a/ping.h b/ping.h
index ed8a566..a60f543 100644
--- a/ping.h
+++ b/ping.h
@@ -61,8 +61,7 @@
 #include <arpa/inet.h>
 #include <linux/types.h>
 #include <linux/errqueue.h>
-
-#include "in6_flowlabel.h"
+#include <linux/in6.h>
 
 #ifndef SCOPE_DELIMITER
 #define SCOPE_DELIMITER '%'