diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/linux/tc_ematch/tc_em_cmp.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/tc_ematch/tc_em_cmp.h')
| -rw-r--r-- | include/linux/tc_ematch/tc_em_cmp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h index 38e7f7b25ec2..f34bb1bae083 100644 --- a/include/linux/tc_ematch/tc_em_cmp.h +++ b/include/linux/tc_ematch/tc_em_cmp.h | |||
| @@ -4,8 +4,7 @@ | |||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
| 6 | 6 | ||
| 7 | struct tcf_em_cmp | 7 | struct tcf_em_cmp { |
| 8 | { | ||
| 9 | __u32 val; | 8 | __u32 val; |
| 10 | __u32 mask; | 9 | __u32 mask; |
| 11 | __u16 off; | 10 | __u16 off; |
| @@ -15,8 +14,7 @@ struct tcf_em_cmp | |||
| 15 | __u8 opnd:4; | 14 | __u8 opnd:4; |
| 16 | }; | 15 | }; |
| 17 | 16 | ||
| 18 | enum | 17 | enum { |
| 19 | { | ||
| 20 | TCF_EM_ALIGN_U8 = 1, | 18 | TCF_EM_ALIGN_U8 = 1, |
| 21 | TCF_EM_ALIGN_U16 = 2, | 19 | TCF_EM_ALIGN_U16 = 2, |
| 22 | TCF_EM_ALIGN_U32 = 4 | 20 | TCF_EM_ALIGN_U32 = 4 |