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_act/tc_ipt.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/tc_act/tc_ipt.h')
| -rw-r--r-- | include/linux/tc_act/tc_ipt.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/tc_act/tc_ipt.h b/include/linux/tc_act/tc_ipt.h index 4b6f7b6c7a79..a2335563d21f 100644 --- a/include/linux/tc_act/tc_ipt.h +++ b/include/linux/tc_act/tc_ipt.h | |||
| @@ -5,8 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #define TCA_ACT_IPT 6 | 6 | #define TCA_ACT_IPT 6 |
| 7 | 7 | ||
| 8 | enum | 8 | enum { |
| 9 | { | ||
| 10 | TCA_IPT_UNSPEC, | 9 | TCA_IPT_UNSPEC, |
| 11 | TCA_IPT_TABLE, | 10 | TCA_IPT_TABLE, |
| 12 | TCA_IPT_HOOK, | 11 | TCA_IPT_HOOK, |