Changli Gao c36952e524 netfilter: nf_nat_core: merge the same lines ...

proto->unique_tuple() will be called finally, if the previous calls fail. This
patch checks the false condition of (range->flags &IP_NAT_RANGE_PROTO_RANDOM)
instead to avoid duplicate line of code: proto->unique_tuple().

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

2010-07-23 13:27:08 +02:00

..

netfilter

netfilter: nf_nat_core: merge the same lines

2010-07-23 13:27:08 +02:00

af_inet.c

snmp: 64bit ipstats_mib for all arches

2010-06-30 13:31:19 -07:00

ah4.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

arp.c

arp: RCU change in arp_solicit()

2010-06-25 21:33:16 -07:00

cipso_ipv4.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

datagram.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

devinet.c

arp_notify: allow drivers to explicitly request a notification event.

2010-05-31 00:27:44 -07:00

esp4.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

fib_frontend.c

ipv4: add LINUX_MIB_IPRPFILTER snmp counter

2010-06-03 03:18:19 -07:00

fib_hash.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

fib_lookup.h

ipv4: cleanup - remove two unused parameters from fib_semantic_match().

2009-05-18 15:16:37 -07:00

fib_rules.c

net: rtnetlink: decouple rtnetlink address families from real address families

2010-04-26 16:13:54 +02:00

fib_semantics.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

fib_trie.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

icmp.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

igmp.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

inet_connection_sock.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

inet_diag.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

inet_fragment.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

inet_hashtables.c

net: reserve ports for applications using fixed port numbers

2010-05-15 23:28:40 -07:00

inet_lro.c

net/ipv4: Move && and || to end of previous line

2009-11-23 10:41:23 -08:00

inet_timewait_sock.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

inetpeer.c

inetpeer: restore small inet_peer structures

2010-06-16 11:55:39 -07:00

ip_forward.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip_fragment.c

fragment: add fast path for in-order fragments

2010-06-30 13:44:29 -07:00

ip_gre.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip_input.c

net: use this_cpu_ptr()

2010-06-28 23:24:29 -07:00

ip_options.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

ip_output.c

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

2010-06-23 18:26:27 -07:00

ip_sockglue.c

net - IP_NODEFRAG option for IPv4 socket

2010-06-23 13:16:38 -07:00

ipcomp.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

ipconfig.c

ipconfig: send host-name in DHCP requests

2010-06-02 07:05:03 -07:00

ipip.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ipmr.c

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

2010-06-11 13:32:31 -07:00

Kconfig

syncookies: remove Kconfig text line about disabled-by-default

2010-06-04 15:56:01 -07:00

Makefile

IPVS: Move IPVS to net/netfilter/ipvs

2008-10-07 08:38:24 +11:00

netfilter.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-06-15 17:31:06 +02:00

proc.c

snmp: 64bit ipstats_mib for all arches

2010-06-30 13:31:19 -07:00

protocol.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

raw.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

route.c

inetpeer: restore small inet_peer structures

2010-06-16 11:55:39 -07:00

syncookies.c

syncookies: add support for ECN

2010-06-26 22:00:03 -07:00

sysctl_net_ipv4.c

net: reserve ports for applications using fixed port numbers

2010-05-15 23:28:40 -07:00

tcp_bic.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp_cong.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcp_cubic.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp_diag.c

tcp: diag: Dont report negative values for rx queue

2009-12-03 16:06:13 -08:00

tcp_highspeed.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_htcp.c

net/ipv4: Move && and || to end of previous line

2009-11-23 10:41:23 -08:00

tcp_hybla.c

TCP: tcp_hybla: Fix integer overflow in slow start increment

2010-06-02 07:15:48 -07:00

tcp_illinois.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_input.c

tcp: unify tcp flag macros

2010-06-15 11:56:19 -07:00

tcp_ipv4.c

syncookies: add support for ECN

2010-06-26 22:00:03 -07:00

tcp_lp.c

net/ipv4: Move && and || to end of previous line

2009-11-23 10:41:23 -08:00

tcp_minisocks.c

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

2010-04-11 14:53:53 -07:00

tcp_output.c

tcp: tso_fragment() might avoid GFP_ATOMIC

2010-06-28 23:24:31 -07:00

tcp_probe.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcp_scalable.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp_timer.c

TCP: avoid to send keepalive probes if receiving data

2010-04-27 12:53:25 -07:00

tcp_vegas.c

tcp: tcp_vegas ssthresh bugfix

2009-05-25 22:44:59 -07:00

tcp_vegas.h

[TCP]: congestion control API pass RTT in microseconds

2007-07-31 02:27:57 -07:00

tcp_veno.c

net/ipv4: Move && and || to end of previous line

2009-11-23 10:41:23 -08:00

tcp_westwood.c

[TCP]: congestion control API pass RTT in microseconds

2007-07-31 02:27:57 -07:00

tcp_yeah.c

net/ipv4: Move && and || to end of previous line

2009-11-23 10:41:23 -08:00

tcp.c

net: use this_cpu_ptr()

2010-06-28 23:24:29 -07:00

tunnel4.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

udp.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

udplite.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

xfrm4_input.c

net: Use ip_route_input_noref() in input path

2010-05-17 17:18:51 -07:00

xfrm4_mode_beet.c

ipsec: Interfamily IPSec BEET

2008-08-06 02:39:30 -07:00

xfrm4_mode_transport.c

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10 16:55:54 -07:00

xfrm4_mode_tunnel.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

xfrm4_output.c

netfilter: ipv4: use NFPROTO values for NF_HOOK invocation

2010-03-25 16:00:30 +01:00

xfrm4_policy.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

xfrm4_state.c

xfrm: remove useless forward declarations

2008-11-25 01:05:54 -08:00

xfrm4_tunnel.c

[IPCOMP]: Fix reception of incompressible packets

2008-01-31 19:27:24 -08:00