Merge branch 'master' of ../nf-2.6

This commit is contained in:
Patrick McHardy
2010-03-18 12:55:50 +01:00
4 changed files with 13 additions and 22 deletions

View File

@ -1,8 +1,7 @@
#ifndef _NF_CONNTRACK_TUPLE_COMMON_H
#define _NF_CONNTRACK_TUPLE_COMMON_H
enum ip_conntrack_dir
{
enum ip_conntrack_dir {
IP_CT_DIR_ORIGINAL,
IP_CT_DIR_REPLY,
IP_CT_DIR_MAX