diff options
author | Patrick McHardy <kaber@trash.net> | 2010-07-15 18:15:03 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-07-15 18:15:03 +0200 |
commit | b14f160c11196aeb99000611207bd353c7ae2cb9 (patch) | |
tree | 250e1e5386a24e41f2d1cf83089876549c9135d2 /include/linux/netfilter/xt_CONNMARK.h | |
parent | 0bcda81f5f6d121084131fb944e2940f614cc98c (diff) | |
parent | b4fa7222923bc10476b8753f358e871f461eb2db (diff) |
Merge branch 'master' into iptables-next
Diffstat (limited to 'include/linux/netfilter/xt_CONNMARK.h')
-rw-r--r-- | include/linux/netfilter/xt_CONNMARK.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/include/linux/netfilter/xt_CONNMARK.h b/include/linux/netfilter/xt_CONNMARK.h index 0a854586..2f2e48ec 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*/ |