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
..
2008-10-01 02:48:31 -07:00
2007-07-31 02:28:21 -07:00
2008-08-23 05:16:46 -07:00
2008-06-12 02:38:15 +09:00
2008-07-27 04:40:51 -07:00
2008-02-12 22:50:35 -08:00
2008-07-19 22:35:03 -07:00
2008-07-29 23:57:58 -07:00
2008-08-06 02:40:25 -07:00
2008-07-19 22:35:03 -07:00
2008-08-14 15:33:21 -07:00
2008-08-23 04:43:33 -07:00
2008-07-25 21:43:18 -07:00
2008-07-25 21:43:18 -07:00
2008-08-14 15:33:21 -07:00
2008-06-05 04:02:36 +09:00
2008-07-19 22:35:03 -07:00
2008-09-09 13:51:35 -07:00
2008-09-20 22:20:49 -07:00
2008-07-19 22:34:43 -07:00
2008-07-27 03:59:24 -07:00
2008-08-17 23:21:52 -07:00
2008-07-25 02:54:40 -07:00
2008-04-05 22:33:38 +09:00
2008-07-19 22:36:07 -07:00
2008-07-25 21:43:18 -07:00
2008-08-14 15:33:21 -07:00
2008-04-14 11:15:49 +02:00
2008-07-30 03:27:52 -07:00
2008-06-11 21:00:38 -07:00
2008-08-29 14:27:51 -07:00
2008-10-01 02:48:31 -07:00
2008-09-10 23:39:28 -07:00
2008-06-16 18:25:48 -07:00
2008-08-03 18:13:44 -07:00
2008-08-25 15:18:15 -07:00
2008-09-12 16:17:43 -07:00
2008-06-05 04:02:32 +09:00
2008-06-14 17:04:49 -07:00
2008-08-09 00:35:05 -07:00
2008-06-11 21:00:38 -07:00
2008-03-25 10:23:56 +09:00
2008-08-06 02:40:25 -07:00
2008-01-28 14:53:52 -08:00
2007-10-10 16:55:54 -07:00
2008-03-24 14:51:51 -07:00
2008-03-24 14:51:51 -07:00
2008-08-14 15:33:21 -07:00
2008-03-27 18:48:56 -07:00
2008-03-25 10:23:57 +09:00