mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
93c8b90f01f0dc73891da4e84b26524b61d29d66
linux/include/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
9p: fix error path during early mount
2008-05-14 19:23:27 -05:00
bluetooth
[Bluetooth] Reject L2CAP connections on an insecure ACL link
2008-09-09 07:19:20 +02:00
irda
pkt_sched: Add qdisc_all_tx_empty()
2008-07-08 23:00:25 -07:00
iucv
[AF_IUCV]: postpone receival of iucv-packets
2007-10-10 16:54:51 -07:00
netfilter
netfilter: accounting rework: ct_extend + 64bit counters (v4)
2008-07-21 10:10:58 -07:00
netns
netns: dont alloc ipv6 fib timer list
2008-07-22 14:33:45 -07:00
phonet
Phonet: emit errors when a packet cannot be delivered locally
2008-09-22 20:09:13 -07:00
sctp
sctp: Use skb_queue_walk_safe() and skb_queue_split_tail_init().
2008-09-22 22:14:36 -07:00
tc_act
pkt_action: add new action skbedit
2008-09-12 16:30:20 -07:00
tipc
tipc: Remove unneeded parameter to tipc_createport_raw()
2008-07-14 22:42:19 -07:00
act_api.h
[NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
2008-01-28 15:11:17 -08:00
addrconf.h
netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()
2008-08-14 15:33:21 -07:00
af_rxrpc.h
[AF_RXRPC]: Add an interface to the AF_RXRPC module for the AFS filesystem to use
2007-04-26 15:50:17 -07:00
af_unix.h
[PATCH] f_count may wrap around
2008-07-26 20:53:40 -04:00
ah.h
[IPSEC]: Get rid of ipv6_{auth,esp,comp}_hdr
2007-10-10 16:55:55 -07:00
arp.h
[NETFILTER]: ebtables: remove casts, use consts
2008-01-31 19:27:33 -08:00
atmclip.h
…
ax25.h
[AX25] ax25_ds_timer: use mod_timer instead of add_timer
2008-02-12 17:53:34 -08:00
ax88796.h
ax88796: add 93cx6 eeprom support
2007-10-10 16:53:56 -07:00
cfg80211.h
cfg80211: show interface type
2008-09-24 16:18:00 -04:00
checksum.h
[NET]: Move netfilter checksum helpers to net/core/utils.c
2008-01-28 14:55:14 -08:00
cipso_ipv4.h
[NetLabel]: consolidate the struct socket/sock handling to just struct sock
2007-06-08 13:33:09 -07:00
compat.h
net: Use standard structures for generic socket address structures.
2008-07-19 22:35:47 -07:00
datalink.h
…
dn_dev.h
…
dn_fib.h
[DECNet]: Use rtnl registration interface
2007-04-25 22:27:12 -07:00
dn_neigh.h
…
dn_nsp.h
…
dn_route.h
[NET]: Wrap netdevice hardware header creation.
2007-10-10 16:52:50 -07:00
dn.h
[DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.h
2007-07-10 23:02:12 -07:00
dsfield.h
[NET]: Constify include/net/dsfield.h
2008-01-28 14:55:58 -08:00
dst.h
net: Kill plain NET_XMIT_BYPASS.
2008-08-04 23:04:08 -07:00
esp.h
[IPSEC]: Use crypto_aead and authenc in ESP
2008-01-31 19:27:02 -08:00
fib_rules.h
net: add fib_rules_ops to flush_cache method
2008-07-05 19:01:28 -07:00
flow.h
ipv4: remove unused field in struct flowi (include/net/flow.h).
2008-08-05 01:19:50 -07:00
garp.h
vlan: Add GVRP support
2008-07-05 21:26:57 -07:00
gen_stats.h
[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API
2008-01-28 15:11:10 -08:00
genetlink.h
netlink: Improve returned error codes
2008-06-03 16:36:54 -07:00
icmp.h
mib: put icmpmsg statistics on struct net
2008-07-18 04:04:22 -07:00
ieee80211_crypt.h
[PATCH] Update my email address from jkmaline@cc.hut.fi to j@w1.fi
2007-04-28 11:01:01 -04:00
ieee80211_radiotap.h
include: use get/put_unaligned_* helpers
2008-07-25 10:53:26 -07:00
ieee80211.h
ieee80211.h: remove superfluous ETH_P_PAE definition
2008-09-30 14:07:23 -04:00
if_inet6.h
ipv6: make struct ipv6_devconf static
2008-07-22 14:21:58 -07:00
inet6_connection_sock.h
[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().
2007-01-26 01:04:55 -08:00
inet6_hashtables.h
netns: introduce the net_hash_mix "salt" for hashes
2008-06-16 17:14:11 -07:00
inet_common.h
[NETNS]: Inet control socket should not hold a namespace.
2008-04-03 14:28:30 -07:00
inet_connection_sock.h
net: more #ifdef CONFIG_COMPAT
2008-08-28 02:53:51 -07:00
inet_ecn.h
[IPV6]: Use appropriate sock tclass setting for routing lookup.
2008-04-13 23:40:51 -07:00
inet_frag.h
[NET]: Rename inet_frag.h identifiers COMPLETE, FIRST_IN, LAST_IN to INET_FRAG_*
2008-03-28 16:35:27 -07:00
inet_hashtables.h
netns: introduce the net_hash_mix "salt" for hashes
2008-06-16 17:14:11 -07:00
inet_sock.h
netns: introduce the net_hash_mix "salt" for hashes
2008-06-16 17:14:11 -07:00
inet_timewait_sock.h
netns : fix kernel panic in timewait socket destruction
2008-09-08 13:17:27 -07:00
inetpeer.h
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
ip6_checksum.h
[IPV6]: Dumb typo in generic csum_ipv6_magic()
2006-12-22 11:12:07 -08:00
ip6_fib.h
[NETNS][IPV6] rt6_info - move rt6_info structure inside the namespace
2008-03-04 13:48:30 -08:00
ip6_route.h
netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()
2008-08-14 15:33:21 -07:00
ip6_tunnel.h
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
ip_fib.h
[IPV4]: Fix compile error building without CONFIG_FS_PROC
2008-02-05 02:54:16 -08:00
ip_vs.h
ipvs: Embed user stats structure into kernel stats structure
2008-09-09 09:53:08 +10:00
ip.h
[PATCH] sysctl: make sure that /proc/sys/net/ipv4 appears before per-ns ones
2008-07-26 20:53:10 -04:00
ipcomp.h
ipsec: ipcomp - Merge IPComp implementations
2008-07-25 02:54:40 -07:00
ipconfig.h
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
ipip.h
tunnels: Remove stat member from ip_tunnel struct.
2008-05-21 14:16:36 -07:00
ipv6.h
ipv6: almost identical frag hashing funcs combined
2008-10-01 02:48:31 -07:00
ipx.h
[SK_BUFF]: Introduce skb_transport_header(skb)
2007-04-25 22:25:31 -07:00
iw_handler.h
wext: Emit event stream entries correctly when compat.
2008-06-16 18:50:49 -07:00
lapb.h
…
llc_c_ac.h
…
llc_c_ev.h
…
llc_c_st.h
…
llc_conn.h
[NET]: Make socket creation namespace safe.
2007-10-10 16:49:07 -07:00
llc_if.h
[LLC]: Kill static inline llc_addrany
2008-02-29 11:46:17 -08:00
llc_pdu.h
[LLC]: skb allocation size for responses
2008-03-31 21:02:47 -07:00
llc_s_ac.h
…
llc_s_ev.h
…
llc_s_st.h
…
llc_sap.h
[LLC]: skb allocation size for responses
2008-03-31 21:02:47 -07:00
llc.h
[LLC]: station source mac address
2008-03-28 16:28:36 -07:00
mac80211.h
mac80211: clean up rate control API
2008-09-24 16:18:03 -04:00
mip6.h
[IPV6] MIP6: Use our standard definitions for paddings.
2008-04-12 13:43:22 +09:00
ndisc.h
ndisc: Add missing strategies for per-device retrans timer/reachable time settings.
2008-05-19 16:25:42 -07:00
neighbour.h
core: add stat to track unresolved discards in neighbor cache
2008-07-16 20:50:49 -07:00
net_namespace.h
[PATCH] beginning of sysctl cleanup - ctl_table_set
2008-07-26 20:53:08 -04:00
netdma.h
…
netevent.h
[NET]: Remove unnecessary inclusion of dst.h
2008-01-28 14:53:38 -08:00
netlabel.h
Audit: collect sessionid in netlink messages
2008-04-28 06:18:03 -04:00
netlink.h
netlink: Remove compat API for nested attributes
2008-09-02 17:30:27 -07:00
netrom.h
[PATCH] mark struct file_operations const 1
2007-02-12 09:48:44 -08:00
nexthop.h
…
p8022.h
…
pkt_cls.h
[PKT_SCHED]: Pass real namespace in net scheduler classifiers.
2008-03-27 16:53:37 -07:00
pkt_sched.h
pkt_sched: Remove the tx queue state check in qdisc_run()
2008-09-23 01:05:56 -07:00
protocol.h
[NETNS]: Drop packets in the non-initial namespace on the per/protocol basis.
2008-03-24 15:33:00 -07:00
psnap.h
…
raw.h
[RAW]: Add raw_hashinfo member on struct proto.
2008-03-22 16:56:51 -07:00
rawv6.h
[IPv6] RAW: Compact the API for the kernel
2008-01-28 14:54:29 -08:00
red.h
[NET_SCHED]: turn PSCHED_GET_TIME into inline function
2007-04-25 22:27:55 -07:00
request_sock.h
tcp: Fix kernel panic when calling tcp_v(4/6)_md5_do_lookup
2008-08-06 23:50:04 -07:00
rose.h
rose: improving AX25 routing frames via ROSE network
2008-06-17 17:08:32 -07:00
route.h
net: missing bits of net-namespace / sysctl
2008-07-27 04:40:51 -07:00
rtnetlink.h
[RTNL]: Introduce the rtnl_kill_links helper.
2008-04-16 00:46:52 -07:00
sch_generic.h
pkt_sched: Make qdisc->gso_skb a list.
2008-09-22 22:15:30 -07:00
scm.h
pid namespaces: changes to show virtual ids to user
2007-10-19 11:53:40 -07:00
slhc_vj.h
…
snmp.h
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
sock.h
net: more #ifdef CONFIG_COMPAT
2008-08-28 02:53:51 -07:00
stp.h
net: Add STP demux layer
2008-07-05 21:25:39 -07:00
syncppp.h
Remove bogus variables from syncppp.[ch]
2008-07-23 23:00:31 +02:00
tcp_states.h
…
tcp.h
tcp: Use SKB queue handling interfaces instead of by-hand versions.
2008-09-23 00:50:13 -07:00
timewait_sock.h
…
transp_v6.h
net: change proto destroy method to return void
2008-06-14 17:04:49 -07:00
udp.h
mib: put udplite statistics on struct net
2008-07-18 04:03:45 -07:00
udplite.h
[UDP]: Revert udplite and code split.
2008-03-06 16:22:02 -08:00
wext.h
wext: Dispatch and handle compat ioctls entirely in net/wireless/wext.c
2008-06-16 18:32:46 -07:00
wireless.h
cfg80211: show interface type
2008-09-24 16:18:00 -04:00
x25.h
[X.25]: Adds /proc/sys/net/x25/x25_forward to control forwarding.
2007-02-08 13:34:36 -08:00
x25device.h
[SK_BUFF]: Introduce skb_reset_mac_header(skb)
2007-04-25 22:24:32 -07:00
xfrm.h
ipsec: Fix xfrm_state_walk race
2008-09-22 19:48:19 -07:00