linux-stable.git/include/linux/netfilter.h, branch linux-2.6.25.y

[NETFILTER]: Fix NF_QUEUE_NR() parenthesis

2008-02-27T20:21:18+00:00

Properly add parens around the macro argument. This is not needed by
the kernel but the macro is exported to userspace, so it shouldn't
make any assumptions.

Also use NF_VERDICT_BITS instead of NF_VERDICT_QBTIS for the left-shift
since thats whats logically correct.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: Use __u32 in struct nf_inet_addr

2008-02-20T01:20:33+00:00

As reported by David Woodhouse , using u_int32_t
in struct nf_inet_addr breaks the busybox build. Fix by using __u32.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: Extend nf_inet_addr with in{,6}_addr

2008-01-28T23:02:22+00:00

Extend union nf_inet_addr with struct in_addr and in6_addr. Useful
because a lot of in-kernel IPv4 and IPv6 functions use
in_addr/in6_addr.

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: Use the ctl paths instead of hand-made analogue

2008-01-28T23:01:11+00:00

The conntracks subsystem has a similar infrastructure
to maintain ctl_paths, but since we already have it
on the generic level, I think it's OK to switch to
using it.

So, basically, this patch just replaces the ctl_table-s
with ctl_path-s, nf_register_sysctl_table with
register_sysctl_paths() and removes no longer needed code.

After this the net/netfilter/nf_sysctl.c file contains
the paths only.

Signed-off-by: Pavel Emelyanov 
Acked-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: Introduce nf_inet_address

2008-01-28T22:59:07+00:00

A few netfilter modules provide their own union of IPv4 and IPv6
address storage. Will unify that in this patch series.

(1/4): Rename union nf_conntrack_address to union nf_inet_addr and
move it to x_tables.h.

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: nf_nat: properly use RCU for ip_nat_decode_session

2008-01-28T22:59:06+00:00

We need to use rcu_assign_pointer/rcu_dereference to avoid races.
Also remove an obsolete CONFIG_IP_NAT_NEEDED ifdef.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: constify nf_afinfo

2008-01-28T22:59:05+00:00

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: Kill function prototype for non-existing function

2008-01-28T22:59:05+00:00

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: nf_log: move logging stuff to seperate header

2008-01-28T22:58:58+00:00

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: nf_queue: move list_head/skb/id to struct nf_info

2008-01-28T22:56:14+00:00

Move common fields for queue management to struct nf_info and rename it
to struct nf_queue_entry. The avoids one allocation/free per packet and
simplifies the code a bit.

Alternatively we could add some private room at the tail, but since
all current users use identical structs this seems easier.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller