1 files changed, 0 insertions, 127 deletions
diff --git a/include/linux/tcp_diag.h b/include/linux/tcp_diag.h
deleted file mode 100644
index 7a5996743946..000000000000
--- a/include/linux/tcp_diag.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#ifndef _TCP_DIAG_H_
-#define _TCP_DIAG_H_ 1
-/* Just some random number */
-#define TCPDIAG_GETSOCK 18
-/* Socket identity */
-struct tcpdiag_sockid
-{
-        __u16   tcpdiag_sport;
-        __u16   tcpdiag_dport;
-        __u32   tcpdiag_src[4];
-        __u32   tcpdiag_dst[4];
-        __u32   tcpdiag_if;
-        __u32   tcpdiag_cookie[2];
-#define TCPDIAG_NOCOOKIE (~0U)
-};
-/* Request structure */
-struct tcpdiagreq
-{
-        __u8    tcpdiag_family;         /* Family of addresses. */
-        __u8    tcpdiag_src_len;
-        __u8    tcpdiag_dst_len;
-        __u8    tcpdiag_ext;            /* Query extended information */
-        struct tcpdiag_sockid id;
-        __u32   tcpdiag_states;         /* States to dump */
-        __u32   tcpdiag_dbs;            /* Tables to dump (NI) */
-};
-enum
-{
-        TCPDIAG_REQ_NONE,
-        TCPDIAG_REQ_BYTECODE,
-};
-#define TCPDIAG_REQ_MAX TCPDIAG_REQ_BYTECODE
-/* Bytecode is sequence of 4 byte commands followed by variable arguments.
- * All the commands identified by "code" are conditional jumps forward:
- * to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
- * length of the command and its arguments.
- */
- 
-struct tcpdiag_bc_op
-{
-        unsigned char   code;
-        unsigned char   yes;
-        unsigned short  no;
-};
-enum
-{
-        TCPDIAG_BC_NOP,
-        TCPDIAG_BC_JMP,
-        TCPDIAG_BC_S_GE,
-        TCPDIAG_BC_S_LE,
-        TCPDIAG_BC_D_GE,
-        TCPDIAG_BC_D_LE,
-        TCPDIAG_BC_AUTO,
-        TCPDIAG_BC_S_COND,
-        TCPDIAG_BC_D_COND,
-};
-struct tcpdiag_hostcond
-{
-        __u8    family;
-        __u8    prefix_len;
-        int     port;
-        __u32   addr[0];
-};
-/* Base info structure. It contains socket identity (addrs/ports/cookie)
- * and, alas, the information shown by netstat. */
-struct tcpdiagmsg
-{
-        __u8    tcpdiag_family;
-        __u8    tcpdiag_state;
-        __u8    tcpdiag_timer;
-        __u8    tcpdiag_retrans;
-        struct tcpdiag_sockid id;
-        __u32   tcpdiag_expires;
-        __u32   tcpdiag_rqueue;
-        __u32   tcpdiag_wqueue;
-        __u32   tcpdiag_uid;
-        __u32   tcpdiag_inode;
-};
-/* Extensions */
-enum
-{
-        TCPDIAG_NONE,
-        TCPDIAG_MEMINFO,
-        TCPDIAG_INFO,
-        TCPDIAG_VEGASINFO,
-        TCPDIAG_CONG,
-};
-#define TCPDIAG_MAX TCPDIAG_CONG
-/* TCPDIAG_MEM */
-struct tcpdiag_meminfo
-{
-        __u32   tcpdiag_rmem;
-        __u32   tcpdiag_wmem;
-        __u32   tcpdiag_fmem;
-        __u32   tcpdiag_tmem;
-};
-/* TCPDIAG_VEGASINFO */
-struct tcpvegas_info {
-        __u32   tcpv_enabled;
-        __u32   tcpv_rttcnt;
-        __u32   tcpv_rtt;
-        __u32   tcpv_minrtt;
-};
-#endif /* _TCP_DIAG_H_ */

diff --git a/include/linux/tcp_diag.h b/include/linux/tcp_diag.h deleted file mode 100644 index 7a5996743946..000000000000 --- a/include/linux/tcp_diag.h +++ /dev/null
@@ -1,127 +0,0 @@
1	#ifndef _TCP_DIAG_H_
2	#define _TCP_DIAG_H_ 1
3
4	/* Just some random number */
5	#define TCPDIAG_GETSOCK 18
6
7	/* Socket identity */
8	struct tcpdiag_sockid
9	{
10	__u16 tcpdiag_sport;
11	__u16 tcpdiag_dport;
12	__u32 tcpdiag_src[4];
13	__u32 tcpdiag_dst[4];
14	__u32 tcpdiag_if;
15	__u32 tcpdiag_cookie[2];
16	#define TCPDIAG_NOCOOKIE (~0U)
17	};
18
19	/* Request structure */
20
21	struct tcpdiagreq
22	{
23	__u8 tcpdiag_family; /* Family of addresses. */
24	__u8 tcpdiag_src_len;
25	__u8 tcpdiag_dst_len;
26	__u8 tcpdiag_ext; /* Query extended information */
27
28	struct tcpdiag_sockid id;
29
30	__u32 tcpdiag_states; /* States to dump */
31	__u32 tcpdiag_dbs; /* Tables to dump (NI) */
32	};
33
34	enum
35	{
36	TCPDIAG_REQ_NONE,
37	TCPDIAG_REQ_BYTECODE,
38	};
39
40	#define TCPDIAG_REQ_MAX TCPDIAG_REQ_BYTECODE
41
42	/* Bytecode is sequence of 4 byte commands followed by variable arguments.
43	* All the commands identified by "code" are conditional jumps forward:
44	* to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
45	* length of the command and its arguments.
46	*/
47
48	struct tcpdiag_bc_op
49	{
50	unsigned char code;
51	unsigned char yes;
52	unsigned short no;
53	};
54
55	enum
56	{
57	TCPDIAG_BC_NOP,
58	TCPDIAG_BC_JMP,
59	TCPDIAG_BC_S_GE,
60	TCPDIAG_BC_S_LE,
61	TCPDIAG_BC_D_GE,
62	TCPDIAG_BC_D_LE,
63	TCPDIAG_BC_AUTO,
64	TCPDIAG_BC_S_COND,
65	TCPDIAG_BC_D_COND,
66	};
67
68	struct tcpdiag_hostcond
69	{
70	__u8 family;
71	__u8 prefix_len;
72	int port;
73	__u32 addr[0];
74	};
75
76	/* Base info structure. It contains socket identity (addrs/ports/cookie)
77	* and, alas, the information shown by netstat. */
78	struct tcpdiagmsg
79	{
80	__u8 tcpdiag_family;
81	__u8 tcpdiag_state;
82	__u8 tcpdiag_timer;
83	__u8 tcpdiag_retrans;
84
85	struct tcpdiag_sockid id;
86
87	__u32 tcpdiag_expires;
88	__u32 tcpdiag_rqueue;
89	__u32 tcpdiag_wqueue;
90	__u32 tcpdiag_uid;
91	__u32 tcpdiag_inode;
92	};
93
94	/* Extensions */
95
96	enum
97	{
98	TCPDIAG_NONE,
99	TCPDIAG_MEMINFO,
100	TCPDIAG_INFO,
101	TCPDIAG_VEGASINFO,
102	TCPDIAG_CONG,
103	};
104
105	#define TCPDIAG_MAX TCPDIAG_CONG
106
107
108	/* TCPDIAG_MEM */
109
110	struct tcpdiag_meminfo
111	{
112	__u32 tcpdiag_rmem;
113	__u32 tcpdiag_wmem;
114	__u32 tcpdiag_fmem;
115	__u32 tcpdiag_tmem;
116	};
117
118	/* TCPDIAG_VEGASINFO */
119
120	struct tcpvegas_info {
121	__u32 tcpv_enabled;
122	__u32 tcpv_rttcnt;
123	__u32 tcpv_rtt;
124	__u32 tcpv_minrtt;
125	};
126
127	#endif /* _TCP_DIAG_H_ */