Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (16fb62b6) · Commits · 戴 / test

include/linux/netfilter/Kbuild

+1 −0

+4 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,10 @@ enum ip_conntrack_status {
		/* Conntrack is a template */
		IPS_TEMPLATE_BIT = 11,
		IPS_TEMPLATE = (1 << IPS_TEMPLATE_BIT),

		/* Conntrack is a fake untracked entry */
		IPS_UNTRACKED_BIT = 12,
		IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
		};

		/* Connection tracking event types */

+1 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ enum nfulnl_attr_config {
		#define NFULNL_COPY_NONE 0x00
		#define NFULNL_COPY_META 0x01
		#define NFULNL_COPY_PACKET 0x02
		#define NFULNL_COPY_DISABLED 0x03

		#define NFULNL_CFG_F_SEQ 0x0001
		#define NFULNL_CFG_F_SEQ_GLOBAL 0x0002

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* linux/include/linux/netfilter/xt_IDLETIMER.h
		*
		* Header file for Xtables timer target module.
		*
		* Copyright (C) 2004, 2010 Nokia Corporation
		* Written by Timo Teras <ext-timo.teras@nokia.com>
		*
		* Converted to x_tables and forward-ported to 2.6.34
		* by Luciano Coelho <luciano.coelho@nokia.com>
		*
		* Contact: Luciano Coelho <luciano.coelho@nokia.com>
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
		* 02110-1301 USA
		*/

		#ifndef _XT_IDLETIMER_H
		#define _XT_IDLETIMER_H

		#include <linux/types.h>

		#define MAX_IDLETIMER_LABEL_SIZE 28

		struct idletimer_tg_info {
		__u32 timeout;

		char label[MAX_IDLETIMER_LABEL_SIZE];

		/* for kernel module internal use only */
		struct idletimer_tg *timer __attribute((aligned(8)));
		};

		#endif

+8 −3

Original line number	Diff line number	Diff line
		@@ -257,7 +257,12 @@ extern s16 (nf_ct_nat_offset)(const struct nf_conn ct,
		u32 seq);

		/* Fake conntrack entry for untracked connections */
		extern struct nf_conn nf_conntrack_untracked;
		DECLARE_PER_CPU(struct nf_conn, nf_conntrack_untracked);
		static inline struct nf_conn *nf_ct_untracked_get(void)
		{
		return &__raw_get_cpu_var(nf_conntrack_untracked);
		}
		extern void nf_ct_untracked_status_or(unsigned long bits);

		/* Iterate over all conntracks: if iter returns true, it's deleted. */
		extern void
		@@ -285,9 +290,9 @@ static inline int nf_ct_is_dying(struct nf_conn *ct)
		return test_bit(IPS_DYING_BIT, &ct->status);
		}

		static inline int nf_ct_is_untracked(const struct sk_buff *skb)
		static inline int nf_ct_is_untracked(const struct nf_conn *ct)
		{
		return (skb->nfct == &nf_conntrack_untracked.ct_general);
		return test_bit(IPS_UNTRACKED_BIT, &ct->status);
		}

		extern int nf_conntrack_set_hashsize(const char val, struct kernel_param kp);