lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
93c8b90f01f0dc73891da4e84b26524b61d29d66
linux-kernel-test/net
History
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
..
9p
flag parameters: socket and socketpair
2008-07-24 10:47:27 -07:00
802
list_for_each_rcu must die: networking
2008-07-25 10:53:27 -07:00
8021q
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
appletalk
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
atm
net/atm/lec.c: drop code after return
2008-09-22 19:24:45 -07:00
ax25
AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
2008-08-05 18:46:57 -07:00
bluetooth
[Bluetooth] Reject L2CAP connections on an insecure ACL link
2008-09-09 07:19:20 +02:00
bridge
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-09-08 16:59:05 -07:00
can
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
core
net: add skb_recycle_check() to enable netdriver skb recycling
2008-10-01 02:33:12 -07:00
dccp
This reverts "Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp"
2008-09-09 13:27:22 +02:00
decnet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
econet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ethernet
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
ieee80211
net/ieee80211: adjust error handling
2008-08-22 16:29:49 -04:00
ipv4
tcp: Fix queue traversal in tcp_use_frto().
2008-09-23 02:51:41 -07:00
ipv6
ipv6: almost identical frag hashing funcs combined
2008-10-01 02:48:31 -07:00
ipx
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
iucv
Merge branch 'linus' into cpus4096-for-linus
2008-07-21 17:19:50 +02:00
key
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
lapb
…
llc
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
mac80211
Fix modpost failure when rx handlers are not inlined.
2008-09-30 14:07:25 -04:00
netfilter
netfilter: xt_time gives a wrong monthday in a leap year
2008-09-22 19:02:36 -07:00
netlabel
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
netlink
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
netrom
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
packet
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
phonet
Phonet: Netlink factorization and cleanup
2008-09-30 02:51:18 -07:00
rfkill
rfkill: remove transmitter blocking on suspend
2008-09-15 16:48:25 -04:00
rose
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
rxrpc
net/rxrpc: Use an IS_ERR test rather than a NULL test
2008-08-13 02:40:48 -07:00
sched
pkt_sched: Check the state of tx_queue in dequeue_skb()
2008-09-22 22:16:23 -07:00
sctp
net: Remove __skb_insert() calls outside of skbuff internals.
2008-09-21 21:28:51 -07:00
sunrpc
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
tipc
tipc: Don't use structure names which easily globally conflict.
2008-09-02 23:38:32 -07:00
unix
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2008-07-26 20:23:44 -07:00
wanrouter
wanmain.c doesn't need syncppp.h
2008-07-23 23:00:36 +02:00
wireless
wireless: a global static to local static improvement
2008-09-24 16:18:04 -04:00
x25
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
xfrm
ipsec: Fix xfrm_state_walk race
2008-09-22 19:48:19 -07:00
compat.c
flag parameters: paccept
2008-07-24 10:47:27 -07:00
Kconfig
Phonet: add CONFIG_PHONET
2008-09-22 20:03:00 -07:00
Makefile
Phonet: add CONFIG_PHONET
2008-09-22 20:03:00 -07:00
nonet.c
…
socket.c
SL*B: drop kmem cache argument from constructor
2008-07-26 12:00:07 -07:00
sysctl_net.c
missing bits of net-namespace / sysctl
2008-07-27 09:45:34 -07:00
TUNABLE
…