forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[NETFILTER]: convert nfmark and conntrack mark to 32bit

Browse source 
As discussed at netconf'05, we convert nfmark and conntrack-mark to be
32bits even on 64bit architectures.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harald Welte 2005-08-09 19:22:01 -07:00 • committed by David S. Miller
parent 8f3d17fb7b
commit bf3a46aa9b
8 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/netfilter_ipv4/ip_conntrack.h
View file

@ -171,7 +171,7 @@ struct ip_conntrack
#endif /* CONFIG_IP_NF_NAT_NEEDED */
#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
unsigned long mark;
u_int32_t mark;
#endif
/* Traversed often, so hopefully in different cacheline to top */

2
include/linux/skbuff.h
View file

@ -259,7 +259,7 @@ struct sk_buff {
void (*destructor)(struct sk_buff *skb);
#ifdef CONFIG_NETFILTER
unsigned long nfmark;
__u32 nfmark;
__u32 nfcache;
__u32 nfctinfo;
struct nf_conntrack *nfct;