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

Commit 134ffb4c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents 2238aff5 98d500d6

include/net/netfilter/nf_nat.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ enum nf_nat_manip_type 
#define IP_NAT_RANGE_MAP_IPS 1

#define IP_NAT_RANGE_PROTO_SPECIFIED 2

#define IP_NAT_RANGE_PROTO_RANDOM 4

#define IP_NAT_RANGE_PERSISTENT 8



/* NAT sequence number modifications */

struct nf_nat_seq {

net/ipv4/netfilter/nf_nat_core.c

+2 −1
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ find_best_ips_proto(struct nf_conntrack_tuple *tuple, 
	minip = ntohl(range->min_ip);

	maxip = ntohl(range->max_ip);

	j = jhash_2words((__force u32)tuple->src.u3.ip,

			 (__force u32)tuple->dst.u3.ip, 0);

			 range->flags & IP_NAT_RANGE_PERSISTENT ?

				(__force u32)tuple->dst.u3.ip : 0, 0);

	j = ((u64)j * (maxip - minip + 1)) >> 32;

	*var_ipp = htonl(minip + j);

}

net/netfilter/nf_conntrack_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me, 
	}



	/* Get rid of expecteds, set helpers to NULL. */

	hlist_for_each_entry(h, nn, &net->ct.unconfirmed, hnnode)

	hlist_nulls_for_each_entry(h, nn, &net->ct.unconfirmed, hnnode)

		unhelp(h, me);

	for (i = 0; i < nf_conntrack_htable_size; i++) {

		hlist_nulls_for_each_entry(h, nn, &net->ct.hash[i], hnnode)

net/netfilter/nf_log.c

+4 −0
Original line number Diff line number Diff line
@@ -36,10 +36,14 @@ static struct nf_logger *__find_logger(int pf, const char *str_logger) 
int nf_log_register(u_int8_t pf, struct nf_logger *logger)

{

	const struct nf_logger *llog;

	int i;



	if (pf >= ARRAY_SIZE(nf_loggers))

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(logger->list); i++)

		INIT_LIST_HEAD(&logger->list[i]);



	mutex_lock(&nf_log_mutex);



	if (pf == NFPROTO_UNSPEC) {