Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02d31ed2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 1b66e9fe 9ff5c59c

include/linux/netfilter/nfnetlink.h

+8 −4
Original line number Diff line number Diff line
@@ -41,11 +41,15 @@ enum nfnetlink_groups { 
struct nfattr

{

	u_int16_t nfa_len;

	u_int16_t nfa_type;

	u_int16_t nfa_type;	/* we use 15 bits for the type, and the highest

				 * bit to indicate whether the payload is nested */

} __attribute__ ((packed));



/* FIXME: Shamelessly copy and pasted from rtnetlink.h, it's time

 * 	  to put this in a generic file */

/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from

 * rtnetlink.h, it's time to put this in a generic file */



#define NFNL_NFA_NEST	0x8000

#define NFA_TYPE(attr) 	((attr)->nfa_type & 0x7fff)



#define NFA_ALIGNTO     4

#define NFA_ALIGN(len)	(((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1))
@@ -59,7 +63,7 @@ struct nfattr 
#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0))

#define NFA_NEST(skb, type) \

({	struct nfattr *__start = (struct nfattr *) (skb)->tail; \

	NFA_PUT(skb, type, 0, NULL); \

	NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \

	__start;  })

#define NFA_NEST_END(skb, start) \

({      (start)->nfa_len = ((skb)->tail - (unsigned char *) (start)); \

include/linux/netfilter/nfnetlink_conntrack.h

+12 −3
Original line number Diff line number Diff line
@@ -70,15 +70,24 @@ enum ctattr_l4proto { 


enum ctattr_protoinfo {

	CTA_PROTOINFO_UNSPEC,

	CTA_PROTOINFO_TCP_STATE,

	CTA_PROTOINFO_TCP,

	__CTA_PROTOINFO_MAX

};

#define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1)



enum ctattr_protoinfo_tcp {

	CTA_PROTOINFO_TCP_UNSPEC,

	CTA_PROTOINFO_TCP_STATE,

	__CTA_PROTOINFO_TCP_MAX

};

#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1)



enum ctattr_counters {

	CTA_COUNTERS_UNSPEC,

	CTA_COUNTERS_PACKETS,

	CTA_COUNTERS_BYTES,

	CTA_COUNTERS_PACKETS,		/* old 64bit counters */

	CTA_COUNTERS_BYTES,		/* old 64bit counters */

	CTA_COUNTERS32_PACKETS,

	CTA_COUNTERS32_BYTES,

	__CTA_COUNTERS_MAX

};

#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)

include/linux/netfilter_ipv4/ip_conntrack.h

+6 −2
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ enum ip_conntrack_events 
	/* NAT info */

	IPCT_NATINFO_BIT = 10,

	IPCT_NATINFO = (1 << IPCT_NATINFO_BIT),



	/* Counter highest bit has been set */

	IPCT_COUNTER_FILLING_BIT = 11,

	IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT),

};



enum ip_conntrack_expect_events {
@@ -192,8 +196,8 @@ do { \ 


struct ip_conntrack_counter

{

	u_int64_t packets;

	u_int64_t bytes;

	u_int32_t packets;

	u_int32_t bytes;

};



struct ip_conntrack_helper;

include/linux/netfilter_ipv4/ip_conntrack_protocol.h

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ struct ip_conntrack_protocol 
	int (*to_nfattr)(struct sk_buff *skb, struct nfattr *nfa,

			 const struct ip_conntrack *ct);



	/* convert nfnetlink attributes to protoinfo */

	int (*from_nfattr)(struct nfattr *tb[], struct ip_conntrack *ct);



	int (*tuple_to_nfattr)(struct sk_buff *skb,

			       const struct ip_conntrack_tuple *t);

	int (*nfattr_to_tuple)(struct nfattr *tb[],

include/linux/netfilter_ipv4/ip_conntrack_tuple.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _IP_CONNTRACK_TUPLE_H

#define _IP_CONNTRACK_TUPLE_H



#include <linux/types.h>



/* A `tuple' is a structure containing the information to uniquely

  identify a connection.  ie. if two packets have the same tuple, they

  are in the same connection; if not, they are not.