mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-12-10 21:54:45 +00:00
Update kernel headers to 2.6.25-rc7
Copy sanitized kernel headers from 2.6.25-rc7 to ensure proper compatiability.
This commit is contained in:
parent
f71f75f39b
commit
5344bb287c
@ -19,7 +19,7 @@
|
|||||||
#define NF_VERDICT_QMASK 0xffff0000
|
#define NF_VERDICT_QMASK 0xffff0000
|
||||||
#define NF_VERDICT_QBITS 16
|
#define NF_VERDICT_QBITS 16
|
||||||
|
|
||||||
#define NF_QUEUE_NR(x) (((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK) | NF_QUEUE)
|
#define NF_QUEUE_NR(x) ((((x) << NF_VERDICT_BITS) & NF_VERDICT_QMASK) | NF_QUEUE)
|
||||||
|
|
||||||
/* only for userspace compatibility */
|
/* only for userspace compatibility */
|
||||||
/* Generic cache responses from hook functions.
|
/* Generic cache responses from hook functions.
|
||||||
@ -37,7 +37,7 @@ enum nf_inet_hooks {
|
|||||||
};
|
};
|
||||||
|
|
||||||
union nf_inet_addr {
|
union nf_inet_addr {
|
||||||
u_int32_t all[4];
|
__u32 all[4];
|
||||||
__be32 ip;
|
__be32 ip;
|
||||||
__be32 ip6[4];
|
__be32 ip6[4];
|
||||||
struct in_addr in;
|
struct in_addr in;
|
||||||
|
|||||||
@ -201,8 +201,8 @@ enum
|
|||||||
|
|
||||||
struct tc_u32_key
|
struct tc_u32_key
|
||||||
{
|
{
|
||||||
__u32 mask;
|
__be32 mask;
|
||||||
__u32 val;
|
__be32 val;
|
||||||
int off;
|
int off;
|
||||||
int offmask;
|
int offmask;
|
||||||
};
|
};
|
||||||
@ -213,12 +213,12 @@ struct tc_u32_sel
|
|||||||
unsigned char offshift;
|
unsigned char offshift;
|
||||||
unsigned char nkeys;
|
unsigned char nkeys;
|
||||||
|
|
||||||
__u16 offmask;
|
__be16 offmask;
|
||||||
__u16 off;
|
__u16 off;
|
||||||
short offoff;
|
short offoff;
|
||||||
|
|
||||||
short hoff;
|
short hoff;
|
||||||
__u32 hmask;
|
__be32 hmask;
|
||||||
struct tc_u32_key keys[0];
|
struct tc_u32_key keys[0];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@ typedef __kernel_mqd_t mqd_t;
|
|||||||
typedef __kernel_uid_t uid_t;
|
typedef __kernel_uid_t uid_t;
|
||||||
typedef __kernel_gid_t gid_t;
|
typedef __kernel_gid_t gid_t;
|
||||||
|
|
||||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
#if defined(__GNUC__)
|
||||||
typedef __kernel_loff_t loff_t;
|
typedef __kernel_loff_t loff_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -92,7 +92,7 @@ typedef __u8 uint8_t;
|
|||||||
typedef __u16 uint16_t;
|
typedef __u16 uint16_t;
|
||||||
typedef __u32 uint32_t;
|
typedef __u32 uint32_t;
|
||||||
|
|
||||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
#if defined(__GNUC__)
|
||||||
typedef __u64 uint64_t;
|
typedef __u64 uint64_t;
|
||||||
typedef __u64 u_int64_t;
|
typedef __u64 u_int64_t;
|
||||||
typedef __s64 int64_t;
|
typedef __s64 int64_t;
|
||||||
@ -154,7 +154,7 @@ typedef __u16 __bitwise __le16;
|
|||||||
typedef __u16 __bitwise __be16;
|
typedef __u16 __bitwise __be16;
|
||||||
typedef __u32 __bitwise __le32;
|
typedef __u32 __bitwise __le32;
|
||||||
typedef __u32 __bitwise __be32;
|
typedef __u32 __bitwise __be32;
|
||||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
#if defined(__GNUC__)
|
||||||
typedef __u64 __bitwise __le64;
|
typedef __u64 __bitwise __le64;
|
||||||
typedef __u64 __bitwise __be64;
|
typedef __u64 __bitwise __be64;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user