Ilpo Järvinen 93c8b90f01 ipv6: almost identical frag hashing funcs combined ...

$ diff-funcs ip6qhashfn reassembly.c netfilter/nf_conntrack_reasm.c
 --- reassembly.c:ip6qhashfn()
 +++ netfilter/nf_conntrack_reasm.c:ip6qhashfn()
@@ -1,5 +1,5 @@
-static unsigned int ip6qhashfn(__be32 id, struct in6_addr *saddr,
-			       struct in6_addr *daddr)
+static unsigned int ip6qhashfn(__be32 id, const struct in6_addr *saddr,
+			       const struct in6_addr *daddr)
 {
 	u32 a, b, c;

@@ -9,7 +9,7 @@

 	a += JHASH_GOLDEN_RATIO;
 	b += JHASH_GOLDEN_RATIO;
-	c += ip6_frags.rnd;
+	c += nf_frags.rnd;
 	__jhash_mix(a, b, c);

 	a += (__force u32)saddr->s6_addr32[3];

And codiff xx.o.old xx.o.new:

net/ipv6/netfilter/nf_conntrack_reasm.c:
  ip6qhashfn         | -512
  nf_hashfn          |   +6
  nf_ct_frag6_gather |  +36
 3 functions changed, 42 bytes added, 512 bytes removed, diff: -470
net/ipv6/reassembly.c:
  ip6qhashfn    | -512
  ip6_hashfn    |   +7
  ipv6_frag_rcv |  +89
 3 functions changed, 96 bytes added, 512 bytes removed, diff: -416

net/ipv6/reassembly.c:
  inet6_hash_frag | +510
 1 function changed, 510 bytes added, diff: +510

Total: -376

Compile tested.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2008-10-01 02:48:31 -07:00

..

netfilter

ipv6: almost identical frag hashing funcs combined

2008-10-01 02:48:31 -07:00

addrconf_core.c

[IPV6]: ipv6_addr_type() doesn't know about RFC4193 addresses.

2007-07-31 02:28:21 -07:00

addrconf.c

ipv6: protocol for address routes

2008-08-23 05:16:46 -07:00

addrlabel.c

ipv6 netns: Address labels per namespace

2008-06-12 02:38:15 +09:00

af_inet6.c

net: missing bits of net-namespace / sysctl

2008-07-27 04:40:51 -07:00

ah6.c

[IPSEC]: Fix bogus usage of u64 on input sequence number

2008-02-12 22:50:35 -08:00

anycast.c

ipv6 netns: Make several "global" sysctl variables namespace aware.

2008-07-19 22:35:03 -07:00

datagram.c

IPv6: datagram_send_ctl() should exit immediately when an error occured

2008-07-29 23:57:58 -07:00

esp6.c

ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer

2008-08-06 02:40:25 -07:00

exthdrs_core.c

…

exthdrs.c

ipv6 netns: Make several "global" sysctl variables namespace aware.

2008-07-19 22:35:03 -07:00

fib6_rules.c

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -07:00

icmp.c

icmp: icmp_sk() should not use smp_processor_id() in preemptible code

2008-08-23 04:43:33 -07:00

inet6_connection_sock.c

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

inet6_hashtables.c

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

ip6_fib.c

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -07:00

ip6_flowlabel.c

[IPV6] NETNS: Handle ancillary data in appropriate namespace.

2008-06-05 04:02:36 +09:00

ip6_input.c

ipv6 netns: Make several "global" sysctl variables namespace aware.

2008-07-19 22:35:03 -07:00

ip6_output.c

ipv6: Fix OOPS in ip6_dst_lookup_tail().

2008-09-09 13:51:35 -07:00

ip6_tunnel.c

net: Use hton[sl]() instead of __constant_hton[sl]() where applicable

2008-09-20 22:20:49 -07:00

ip6mr.c

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

ipcomp6.c

ipcomp: Fix warnings after ipcomp consolidation.

2008-07-27 03:59:24 -07:00

ipv6_sockglue.c

ipv6: Fix the return interface index when get it while no message is received.

2008-08-17 23:21:52 -07:00

Kconfig

ipsec: ipcomp - Merge IPComp implementations

2008-07-25 02:54:40 -07:00

Makefile

[IPV6] MROUTE: Support multicast forwarding.

2008-04-05 22:33:38 +09:00

mcast.c

ipv6 mcast: Omit redundant address family checks in ip6_mc_source().

2008-07-19 22:36:07 -07:00

mip6.c

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

ndisc.c

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -07:00

netfilter.c

[NETFILTER]: Add partial checksum validation helper

2008-04-14 11:15:49 +02:00

proc.c

ipv6: Fix useless proc net sockstat6 removal

2008-07-30 03:27:52 -07:00

protocol.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

raw.c

ipv6: When we droped a packet, we should return NET_RX_DROP instead of 0

2008-08-29 14:27:51 -07:00

reassembly.c

ipv6: almost identical frag hashing funcs combined

2008-10-01 02:48:31 -07:00

route.c

ipv6: On interface down/unregister, purge icmp routes too.

2008-09-10 23:39:28 -07:00

sit.c

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

2008-06-16 18:25:48 -07:00

syncookies.c

ipv6: syncookies: free reqsk on xfrm_lookup error

2008-08-03 18:13:44 -07:00

sysctl_net_ipv6.c

ipv6: sysctl fixes

2008-08-25 15:18:15 -07:00

tcp_ipv6.c

tcp_ipv6: fix use of uninitialized memory

2008-09-12 16:17:43 -07:00

tunnel6.c

[IPV6] TUNNEL6: Fix incoming packet length check for inter-protocol tunnel.

2008-06-05 04:02:32 +09:00

udp_impl.h

net: change proto destroy method to return void

2008-06-14 17:04:49 -07:00

udp.c

udp: Drop socket lock for encapsulated packets

2008-08-09 00:35:05 -07:00

udplite.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

xfrm6_input.c

[XFRM] IPV6: Optimize xfrm6_input_addr().

2008-03-25 10:23:56 +09:00

xfrm6_mode_beet.c

ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer

2008-08-06 02:40:25 -07:00

xfrm6_mode_ro.c

[IPSEC]: Make x->lastused an unsigned long

2008-01-28 14:53:52 -08:00

xfrm6_mode_transport.c

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

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

xfrm6_mode_tunnel.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm6_output.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm6_policy.c

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -07:00

xfrm6_state.c

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

2008-03-27 18:48:56 -07:00

xfrm6_tunnel.c

[XFRM] IPV6: Optimize __xfrm_tunnel_alloc_spi().

2008-03-25 10:23:57 +09:00