summaryrefslogtreecommitdiff
path: root/include/linux/netfilter_ipv4/ipt_ECN.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-28 15:03:58 +0400
committerTakashi Iwai <tiwai@suse.de>2011-03-28 15:03:58 +0400
commitcdccfc8dc0bf62a1da327324a8d639139acc9279 (patch)
treedca7934b27d510c9c006558979ebc48e07a531cf /include/linux/netfilter_ipv4/ipt_ECN.h
parentb21a8ee67013372f439fbd1591e91d09de49bb9c (diff)
parentc6b358748e19ce7e230b0926ac42696bc485a562 (diff)
downloadlinux-cdccfc8dc0bf62a1da327324a8d639139acc9279.tar.xz
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'include/linux/netfilter_ipv4/ipt_ECN.h')
-rw-r--r--include/linux/netfilter_ipv4/ipt_ECN.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/netfilter_ipv4/ipt_ECN.h b/include/linux/netfilter_ipv4/ipt_ECN.h
index 7ca45918ab8e..bb88d5315a4d 100644
--- a/include/linux/netfilter_ipv4/ipt_ECN.h
+++ b/include/linux/netfilter_ipv4/ipt_ECN.h
@@ -8,6 +8,8 @@
*/
#ifndef _IPT_ECN_TARGET_H
#define _IPT_ECN_TARGET_H
+
+#include <linux/types.h>
#include <linux/netfilter/xt_DSCP.h>
#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
@@ -19,11 +21,11 @@
#define IPT_ECN_OP_MASK 0xce
struct ipt_ECN_info {
- u_int8_t operation; /* bitset of operations */
- u_int8_t ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */
+ __u8 operation; /* bitset of operations */
+ __u8 ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */
union {
struct {
- u_int8_t ece:1, cwr:1; /* TCP ECT bits */
+ __u8 ece:1, cwr:1; /* TCP ECT bits */
} tcp;
} proto;
};