diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-02-26 14:20:32 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-03-17 15:48:36 +0100 |
| commit | b8f00ba27e4acc4a2224360ce3aa8a22354434c5 (patch) | |
| tree | 60b9e536bc19ba6d4ddacd4bac5ebec1da9dc1d7 /include | |
| parent | netfilter: xtables: merge xt_MARK into xt_mark (diff) | |
| download | linux-b8f00ba27e4acc4a2224360ce3aa8a22354434c5.tar.xz linux-b8f00ba27e4acc4a2224360ce3aa8a22354434c5.zip | |
netfilter: xtables: merge xt_CONNMARK into xt_connmark
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/xt_CONNMARK.h | 22 | ||||
| -rw-r--r-- | include/linux/netfilter/xt_connmark.h | 11 |
2 files changed, 12 insertions, 21 deletions
diff --git a/include/linux/netfilter/xt_CONNMARK.h b/include/linux/netfilter/xt_CONNMARK.h index 0a8545866752..2f2e48ec8023 100644 --- a/include/linux/netfilter/xt_CONNMARK.h +++ b/include/linux/netfilter/xt_CONNMARK.h @@ -1,26 +1,6 @@ #ifndef _XT_CONNMARK_H_target #define _XT_CONNMARK_H_target -#include <linux/types.h> - -/* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com> - * by Henrik Nordstrom <hno@marasystems.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -enum { - XT_CONNMARK_SET = 0, - XT_CONNMARK_SAVE, - XT_CONNMARK_RESTORE -}; - -struct xt_connmark_tginfo1 { - __u32 ctmark, ctmask, nfmask; - __u8 mode; -}; +#include <linux/netfilter/xt_connmark.h> #endif /*_XT_CONNMARK_H_target*/ diff --git a/include/linux/netfilter/xt_connmark.h b/include/linux/netfilter/xt_connmark.h index 619e47cde01a..efc17a8305fb 100644 --- a/include/linux/netfilter/xt_connmark.h +++ b/include/linux/netfilter/xt_connmark.h @@ -12,6 +12,17 @@ * (at your option) any later version. */ +enum { + XT_CONNMARK_SET = 0, + XT_CONNMARK_SAVE, + XT_CONNMARK_RESTORE +}; + +struct xt_connmark_tginfo1 { + __u32 ctmark, ctmask, nfmask; + __u8 mode; +}; + struct xt_connmark_mtinfo1 { __u32 mark, mask; __u8 invert; |