aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2006-09-28 01:40:19 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 21:02:50 -0400
commitcbde1668e4f08e0a150207646010bc65e1e2a42b (patch)
tree568986c8b47b7228deb05f3b415318a9eb20d528 /include
parent7b4dc3600e4877178ba94c7fbf7e520421378aa6 (diff)
[NET]: Move netlink interface bits to linux/if_link.h.
Moving netlink interface bits to linux/if.h is rather troublesome for applications including both linux/if.h (which was changed to be included from linux/rtnetlink.h automatically) and net/if.h. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/if.h130
-rw-r--r--include/linux/if_link.h136
-rw-r--r--include/linux/rtnetlink.h2
3 files changed, 137 insertions, 131 deletions
diff --git a/include/linux/if.h b/include/linux/if.h
index 8018c2e22c0c..32bf419351f1 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -214,134 +214,4 @@ struct ifconf
214#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ 214#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */
215#define ifc_req ifc_ifcu.ifcu_req /* array of structures */ 215#define ifc_req ifc_ifcu.ifcu_req /* array of structures */
216 216
217/* The struct should be in sync with struct net_device_stats */
218struct rtnl_link_stats
219{
220 __u32 rx_packets; /* total packets received */
221 __u32 tx_packets; /* total packets transmitted */
222 __u32 rx_bytes; /* total bytes received */
223 __u32 tx_bytes; /* total bytes transmitted */
224 __u32 rx_errors; /* bad packets received */
225 __u32 tx_errors; /* packet transmit problems */
226 __u32 rx_dropped; /* no space in linux buffers */
227 __u32 tx_dropped; /* no space available in linux */
228 __u32 multicast; /* multicast packets received */
229 __u32 collisions;
230
231 /* detailed rx_errors: */
232 __u32 rx_length_errors;
233 __u32 rx_over_errors; /* receiver ring buff overflow */
234 __u32 rx_crc_errors; /* recved pkt with crc error */
235 __u32 rx_frame_errors; /* recv'd frame alignment error */
236 __u32 rx_fifo_errors; /* recv'r fifo overrun */
237 __u32 rx_missed_errors; /* receiver missed packet */
238
239 /* detailed tx_errors */
240 __u32 tx_aborted_errors;
241 __u32 tx_carrier_errors;
242 __u32 tx_fifo_errors;
243 __u32 tx_heartbeat_errors;
244 __u32 tx_window_errors;
245
246 /* for cslip etc */
247 __u32 rx_compressed;
248 __u32 tx_compressed;
249};
250
251/* The struct should be in sync with struct ifmap */
252struct rtnl_link_ifmap
253{
254 __u64 mem_start;
255 __u64 mem_end;
256 __u64 base_addr;
257 __u16 irq;
258 __u8 dma;
259 __u8 port;
260};
261
262enum
263{
264 IFLA_UNSPEC,
265 IFLA_ADDRESS,
266 IFLA_BROADCAST,
267 IFLA_IFNAME,
268 IFLA_MTU,
269 IFLA_LINK,
270 IFLA_QDISC,
271 IFLA_STATS,
272 IFLA_COST,
273#define IFLA_COST IFLA_COST
274 IFLA_PRIORITY,
275#define IFLA_PRIORITY IFLA_PRIORITY
276 IFLA_MASTER,
277#define IFLA_MASTER IFLA_MASTER
278 IFLA_WIRELESS, /* Wireless Extension event - see wireless.h */
279#define IFLA_WIRELESS IFLA_WIRELESS
280 IFLA_PROTINFO, /* Protocol specific information for a link */
281#define IFLA_PROTINFO IFLA_PROTINFO
282 IFLA_TXQLEN,
283#define IFLA_TXQLEN IFLA_TXQLEN
284 IFLA_MAP,
285#define IFLA_MAP IFLA_MAP
286 IFLA_WEIGHT,
287#define IFLA_WEIGHT IFLA_WEIGHT
288 IFLA_OPERSTATE,
289 IFLA_LINKMODE,
290 __IFLA_MAX
291};
292
293
294#define IFLA_MAX (__IFLA_MAX - 1)
295
296/* ifi_flags.
297
298 IFF_* flags.
299
300 The only change is:
301 IFF_LOOPBACK, IFF_BROADCAST and IFF_POINTOPOINT are
302 more not changeable by user. They describe link media
303 characteristics and set by device driver.
304
305 Comments:
306 - Combination IFF_BROADCAST|IFF_POINTOPOINT is invalid
307 - If neither of these three flags are set;
308 the interface is NBMA.
309
310 - IFF_MULTICAST does not mean anything special:
311 multicasts can be used on all not-NBMA links.
312 IFF_MULTICAST means that this media uses special encapsulation
313 for multicast frames. Apparently, all IFF_POINTOPOINT and
314 IFF_BROADCAST devices are able to use multicasts too.
315 */
316
317/* IFLA_LINK.
318 For usual devices it is equal ifi_index.
319 If it is a "virtual interface" (f.e. tunnel), ifi_link
320 can point to real physical interface (f.e. for bandwidth calculations),
321 or maybe 0, what means, that real media is unknown (usual
322 for IPIP tunnels, when route to endpoint is allowed to change)
323 */
324
325/* Subtype attributes for IFLA_PROTINFO */
326enum
327{
328 IFLA_INET6_UNSPEC,
329 IFLA_INET6_FLAGS, /* link flags */
330 IFLA_INET6_CONF, /* sysctl parameters */
331 IFLA_INET6_STATS, /* statistics */
332 IFLA_INET6_MCAST, /* MC things. What of them? */
333 IFLA_INET6_CACHEINFO, /* time values and max reasm size */
334 __IFLA_INET6_MAX
335};
336
337#define IFLA_INET6_MAX (__IFLA_INET6_MAX - 1)
338
339struct ifla_cacheinfo
340{
341 __u32 max_reasm_len;
342 __u32 tstamp; /* ipv6InterfaceTable updated timestamp */
343 __u32 reachable_time;
344 __u32 retrans_time;
345};
346
347#endif /* _LINUX_IF_H */ 217#endif /* _LINUX_IF_H */
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
new file mode 100644
index 000000000000..e963a077e6f5
--- /dev/null
+++ b/include/linux/if_link.h
@@ -0,0 +1,136 @@
1#ifndef _LINUX_IF_LINK_H
2#define _LINUX_IF_LINK_H
3
4#include <linux/netlink.h>
5
6/* The struct should be in sync with struct net_device_stats */
7struct rtnl_link_stats
8{
9 __u32 rx_packets; /* total packets received */
10 __u32 tx_packets; /* total packets transmitted */
11 __u32 rx_bytes; /* total bytes received */
12 __u32 tx_bytes; /* total bytes transmitted */
13 __u32 rx_errors; /* bad packets received */
14 __u32 tx_errors; /* packet transmit problems */
15 __u32 rx_dropped; /* no space in linux buffers */
16 __u32 tx_dropped; /* no space available in linux */
17 __u32 multicast; /* multicast packets received */
18 __u32 collisions;
19
20 /* detailed rx_errors: */
21 __u32 rx_length_errors;
22 __u32 rx_over_errors; /* receiver ring buff overflow */
23 __u32 rx_crc_errors; /* recved pkt with crc error */
24 __u32 rx_frame_errors; /* recv'd frame alignment error */
25 __u32 rx_fifo_errors; /* recv'r fifo overrun */
26 __u32 rx_missed_errors; /* receiver missed packet */
27
28 /* detailed tx_errors */
29 __u32 tx_aborted_errors;
30 __u32 tx_carrier_errors;
31 __u32 tx_fifo_errors;
32 __u32 tx_heartbeat_errors;
33 __u32 tx_window_errors;
34
35 /* for cslip etc */
36 __u32 rx_compressed;
37 __u32 tx_compressed;
38};
39
40/* The struct should be in sync with struct ifmap */
41struct rtnl_link_ifmap
42{
43 __u64 mem_start;
44 __u64 mem_end;
45 __u64 base_addr;
46 __u16 irq;
47 __u8 dma;
48 __u8 port;
49};
50
51enum
52{
53 IFLA_UNSPEC,
54 IFLA_ADDRESS,
55 IFLA_BROADCAST,
56 IFLA_IFNAME,
57 IFLA_MTU,
58 IFLA_LINK,
59 IFLA_QDISC,
60 IFLA_STATS,
61 IFLA_COST,
62#define IFLA_COST IFLA_COST
63 IFLA_PRIORITY,
64#define IFLA_PRIORITY IFLA_PRIORITY
65 IFLA_MASTER,
66#define IFLA_MASTER IFLA_MASTER
67 IFLA_WIRELESS, /* Wireless Extension event - see wireless.h */
68#define IFLA_WIRELESS IFLA_WIRELESS
69 IFLA_PROTINFO, /* Protocol specific information for a link */
70#define IFLA_PROTINFO IFLA_PROTINFO
71 IFLA_TXQLEN,
72#define IFLA_TXQLEN IFLA_TXQLEN
73 IFLA_MAP,
74#define IFLA_MAP IFLA_MAP
75 IFLA_WEIGHT,
76#define IFLA_WEIGHT IFLA_WEIGHT
77 IFLA_OPERSTATE,
78 IFLA_LINKMODE,
79 __IFLA_MAX
80};
81
82
83#define IFLA_MAX (__IFLA_MAX - 1)
84
85/* ifi_flags.
86
87 IFF_* flags.
88
89 The only change is:
90 IFF_LOOPBACK, IFF_BROADCAST and IFF_POINTOPOINT are
91 more not changeable by user. They describe link media
92 characteristics and set by device driver.
93
94 Comments:
95 - Combination IFF_BROADCAST|IFF_POINTOPOINT is invalid
96 - If neither of these three flags are set;
97 the interface is NBMA.
98
99 - IFF_MULTICAST does not mean anything special:
100 multicasts can be used on all not-NBMA links.
101 IFF_MULTICAST means that this media uses special encapsulation
102 for multicast frames. Apparently, all IFF_POINTOPOINT and
103 IFF_BROADCAST devices are able to use multicasts too.
104 */
105
106/* IFLA_LINK.
107 For usual devices it is equal ifi_index.
108 If it is a "virtual interface" (f.e. tunnel), ifi_link
109 can point to real physical interface (f.e. for bandwidth calculations),
110 or maybe 0, what means, that real media is unknown (usual
111 for IPIP tunnels, when route to endpoint is allowed to change)
112 */
113
114/* Subtype attributes for IFLA_PROTINFO */
115enum
116{
117 IFLA_INET6_UNSPEC,
118 IFLA_INET6_FLAGS, /* link flags */
119 IFLA_INET6_CONF, /* sysctl parameters */
120 IFLA_INET6_STATS, /* statistics */
121 IFLA_INET6_MCAST, /* MC things. What of them? */
122 IFLA_INET6_CACHEINFO, /* time values and max reasm size */
123 __IFLA_INET6_MAX
124};
125
126#define IFLA_INET6_MAX (__IFLA_INET6_MAX - 1)
127
128struct ifla_cacheinfo
129{
130 __u32 max_reasm_len;
131 __u32 tstamp; /* ipv6InterfaceTable updated timestamp */
132 __u32 reachable_time;
133 __u32 retrans_time;
134};
135
136#endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 9c92dc8b9a08..3a18addaed4c 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -2,7 +2,7 @@
2#define __LINUX_RTNETLINK_H 2#define __LINUX_RTNETLINK_H
3 3
4#include <linux/netlink.h> 4#include <linux/netlink.h>
5#include <linux/if.h> 5#include <linux/if_link.h>
6 6
7/**** 7/****
8 * Routing/neighbour discovery messages. 8 * Routing/neighbour discovery messages.