git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
linux
/
netfilter_ipv4
/
ip_nat.h
diff --git
a/include/linux/netfilter_ipv4/ip_nat.h
b/include/linux/netfilter_ipv4/ip_nat.h
index
2b72b86
..
e9f5ed1
100644
(file)
--- a/
include/linux/netfilter_ipv4/ip_nat.h
+++ b/
include/linux/netfilter_ipv4/ip_nat.h
@@
-23,7
+23,7
@@
struct ip_nat_seq {
* modification (if any) */
u_int32_t correction_pos;
/* sequence number offset before and after last modification */
* modification (if any) */
u_int32_t correction_pos;
/* sequence number offset before and after last modification */
- int
32
_t offset_before, offset_after;
+ int
16
_t offset_before, offset_after;
};
/* Single range specification. */
};
/* Single range specification. */
@@
-50,19
+50,14
@@
struct ip_nat_multi_range_compat
#ifdef __KERNEL__
#include <linux/list.h>
#ifdef __KERNEL__
#include <linux/list.h>
-#include <linux/netfilter_ipv4/lockhelp.h>
/* Protects NAT hash tables, and NAT-private part of conntracks. */
/* Protects NAT hash tables, and NAT-private part of conntracks. */
-
DECLARE_RWLOCK_EXTERN(ip_nat_lock)
;
+
extern rwlock_t ip_nat_lock
;
/* The structure embedded in the conntrack structure. */
struct ip_nat_info
{
struct list_head bysource;
/* The structure embedded in the conntrack structure. */
struct ip_nat_info
{
struct list_head bysource;
-
- /* Helper (NULL if none). */
- struct ip_nat_helper *helper;
-
struct ip_nat_seq seq[IP_CT_DIR_MAX];
};
struct ip_nat_seq seq[IP_CT_DIR_MAX];
};