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

update headers to current net-2.6.25 

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
This commit is contained in:
Stephen Hemminger 2008-01-24 13:14:28 -08:00
parent 74fe05a2f6
commit fb8cc5b268
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netfilter.h
View File

@ -40,6 +40,8 @@ union nf_inet_addr {
u_int32_t all[4]; u_int32_t all[4];
__be32 ip; __be32 ip;
__be32 ip6[4]; __be32 ip6[4];
struct in_addr in;
struct in6_addr in6;
}; };
#endif /*__LINUX_NETFILTER_H*/ #endif /*__LINUX_NETFILTER_H*/

3
include/linux/pkt_cls.h
View File

@ -409,7 +409,8 @@ enum
#define TCF_EM_U32 3 #define TCF_EM_U32 3
#define TCF_EM_META 4 #define TCF_EM_META 4
#define TCF_EM_TEXT 5 #define TCF_EM_TEXT 5
#define TCF_EM_MAX 5 #define TCF_EM_VLAN 6
#define TCF_EM_MAX 6
enum enum
{ {

2
include/linux/pkt_sched.h
View File

@ -83,6 +83,8 @@ struct tc_ratespec
__u32 rate; __u32 rate;
}; };
#define TC_RTAB_SIZE 1024
/* FIFO section */ /* FIFO section */
struct tc_fifo_qopt struct tc_fifo_qopt

1
include/linux/tc_ematch/tc_em_meta.h
View File

@ -81,6 +81,7 @@ enum
TCF_META_ID_SK_SNDTIMEO, TCF_META_ID_SK_SNDTIMEO,
TCF_META_ID_SK_SENDMSG_OFF, TCF_META_ID_SK_SENDMSG_OFF,
TCF_META_ID_SK_WRITE_PENDING, TCF_META_ID_SK_WRITE_PENDING,
TCF_META_ID_VLAN_TAG,
__TCF_META_ID_MAX __TCF_META_ID_MAX
}; };
#define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1) #define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)

6
include/linux/xfrm.h
View File

@ -91,9 +91,9 @@ struct xfrm_replay_state
}; };
struct xfrm_algo { struct xfrm_algo {
char alg_name[64]; char alg_name[64];
int alg_key_len; /* in bits */ unsigned int alg_key_len; /* in bits */
char alg_key[0]; char alg_key[0];
}; };
struct xfrm_stats { struct xfrm_stats {