matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure we have sanatized headers that match 2.6.9 

(Logical change 1.101)
This commit is contained in:
osdl.net!shemminger 2004-10-19 20:35:34 +00:00
parent 9863498284
commit 091ed21997
2 changed files with 88 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
include/linux/rtnetlink.h
View File

@ -9,53 +9,89 @@
/* Types of messages */ /* Types of messages */
#define RTM_BASE 0x10 enum {
RTM_BASE = 16,
#define RTM_BASE RTM_BASE
#define RTM_NEWLINK (RTM_BASE+0) RTM_NEWLINK = 16,
#define RTM_DELLINK (RTM_BASE+1) #define RTM_NEWLINK RTM_NEWLINK
#define RTM_GETLINK (RTM_BASE+2) RTM_DELLINK,
#define RTM_SETLINK (RTM_BASE+3) #define RTM_DELLINK RTM_DELLINK
RTM_GETLINK,
#define RTM_GETLINK RTM_GETLINK
RTM_SETLINK,
#define RTM_SETLINK RTM_SETLINK
#define RTM_NEWADDR (RTM_BASE+4) RTM_NEWADDR = 20,
#define RTM_DELADDR (RTM_BASE+5) #define RTM_NEWADDR RTM_NEWADDR
#define RTM_GETADDR (RTM_BASE+6) RTM_DELADDR,
#define RTM_DELADDR RTM_DELADDR
RTM_GETADDR,
#define RTM_GETADDR RTM_GETADDR
#define RTM_NEWROUTE (RTM_BASE+8) RTM_NEWROUTE = 24,
#define RTM_DELROUTE (RTM_BASE+9) #define RTM_NEWROUTE RTM_NEWROUTE
#define RTM_GETROUTE (RTM_BASE+10) RTM_DELROUTE,
#define RTM_DELROUTE RTM_DELROUTE
RTM_GETROUTE,
#define RTM_GETROUTE RTM_GETROUTE
#define RTM_NEWNEIGH (RTM_BASE+12) RTM_NEWNEIGH = 28,
#define RTM_DELNEIGH (RTM_BASE+13) #define RTM_NEWNEIGH RTM_NEWNEIGH
#define RTM_GETNEIGH (RTM_BASE+14) RTM_DELNEIGH,
#define RTM_DELNEIGH RTM_DELNEIGH
RTM_GETNEIGH,
#define RTM_GETNEIGH RTM_GETNEIGH
#define RTM_NEWRULE (RTM_BASE+16) RTM_NEWRULE = 32,
#define RTM_DELRULE (RTM_BASE+17) #define RTM_NEWRULE RTM_NEWRULE
#define RTM_GETRULE (RTM_BASE+18) RTM_DELRULE,
#define RTM_DELRULE RTM_DELRULE
RTM_GETRULE,
#define RTM_GETRULE RTM_GETRULE
#define RTM_NEWQDISC (RTM_BASE+20) RTM_NEWQDISC = 36,
#define RTM_DELQDISC (RTM_BASE+21) #define RTM_NEWQDISC RTM_NEWQDISC
#define RTM_GETQDISC (RTM_BASE+22) RTM_DELQDISC,
#define RTM_DELQDISC RTM_DELQDISC
RTM_GETQDISC,
#define RTM_GETQDISC RTM_GETQDISC
#define RTM_NEWTCLASS (RTM_BASE+24) RTM_NEWTCLASS = 40,
#define RTM_DELTCLASS (RTM_BASE+25) #define RTM_NEWTCLASS RTM_NEWTCLASS
#define RTM_GETTCLASS (RTM_BASE+26) RTM_DELTCLASS,
#define RTM_DELTCLASS RTM_DELTCLASS
RTM_GETTCLASS,
#define RTM_GETTCLASS RTM_GETTCLASS
#define RTM_NEWTFILTER (RTM_BASE+28) RTM_NEWTFILTER = 44,
#define RTM_DELTFILTER (RTM_BASE+29) #define RTM_NEWTFILTER RTM_NEWTFILTER
#define RTM_GETTFILTER (RTM_BASE+30) RTM_DELTFILTER,
#define RTM_DELTFILTER RTM_DELTFILTER
RTM_GETTFILTER,
#define RTM_GETTFILTER RTM_GETTFILTER
#define RTM_NEWACTION (RTM_BASE+32) RTM_NEWACTION = 48,
#define RTM_DELACTION (RTM_BASE+33) #define RTM_NEWACTION RTM_NEWACTION
#define RTM_GETACTION (RTM_BASE+34) RTM_DELACTION,
#define RTM_DELACTION RTM_DELACTION
RTM_GETACTION,
#define RTM_GETACTION RTM_GETACTION
#define RTM_NEWPREFIX (RTM_BASE+36) RTM_NEWPREFIX = 52,
#define RTM_GETPREFIX (RTM_BASE+38) #define RTM_NEWPREFIX RTM_NEWPREFIX
RTM_GETPREFIX = 54,
#define RTM_GETPREFIX RTM_GETPREFIX
#define RTM_GETMULTICAST (RTM_BASE+42) RTM_GETMULTICAST = 58,
#define RTM_GETMULTICAST RTM_GETMULTICAST
#define RTM_GETANYCAST (RTM_BASE+46) RTM_GETANYCAST = 62,
#define RTM_GETANYCAST RTM_GETANYCAST
#define RTM_MAX (RTM_BASE+47) RTM_MAX,
#define RTM_MAX RTM_MAX
};
/* /*
Generic structure for encapsulation of optional route information. Generic structure for encapsulation of optional route information.
@ -541,6 +577,17 @@ struct rtnl_link_stats
__u32 tx_compressed; __u32 tx_compressed;
}; };
/* The struct should be in sync with struct ifmap */
struct rtnl_link_ifmap
{
__u64 mem_start;
__u64 mem_end;
__u64 base_addr;
__u16 irq;
__u8 dma;
__u8 port;
};
enum enum
{ {
IFLA_UNSPEC, IFLA_UNSPEC,
@ -561,6 +608,12 @@ enum
#define IFLA_WIRELESS IFLA_WIRELESS #define IFLA_WIRELESS IFLA_WIRELESS
IFLA_PROTINFO, /* Protocol specific information for a link */ IFLA_PROTINFO, /* Protocol specific information for a link */
#define IFLA_PROTINFO IFLA_PROTINFO #define IFLA_PROTINFO IFLA_PROTINFO
IFLA_TXQLEN,
#define IFLA_TXQLEN IFLA_TXQLEN
IFLA_MAP,
#define IFLA_MAP IFLA_MAP
IFLA_WEIGHT,
#define IFLA_WEIGHT IFLA_WEIGHT
__IFLA_MAX __IFLA_MAX
}; };
@ -654,10 +707,6 @@ enum
#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg)) #define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
/* SUMMARY: maximal rtattr understood by kernel */
#define RTATTR_MAX RTA_MAX
/* RTnetlink multicast groups */ /* RTnetlink multicast groups */
#define RTMGRP_LINK 1 #define RTMGRP_LINK 1

1
include/linux/xfrm.h
View File

@ -190,6 +190,7 @@ struct xfrm_usersa_info {
__u8 replay_window; __u8 replay_window;
__u8 flags; __u8 flags;
#define XFRM_STATE_NOECN 1 #define XFRM_STATE_NOECN 1
#define XFRM_STATE_DECAP_DSCP 2
}; };
struct xfrm_usersa_id { struct xfrm_usersa_id {