net: use ktime_get_ns() and ktime_get_real_ns() helpers (d2de875c) · Commits · 戴 / test

include/net/codel.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,7 @@ typedef s32 codel_tdiff_t;

	static inline codel_time_t codel_get_time(void)		static inline codel_time_t codel_get_time(void)
	{		{
	u64 ns = ktime_to_ns(ktime_get());		u64 ns = ktime_get_ns();

	return ns >> CODEL_SHIFT;		return ns >> CODEL_SHIFT;
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ typedef long psched_tdiff_t;

	static inline psched_time_t psched_get_time(void)		static inline psched_time_t psched_get_time(void)
	{		{
	return PSCHED_NS2TICKS(ktime_to_ns(ktime_get()));		return PSCHED_NS2TICKS(ktime_get_ns());
	}		}

	static inline psched_tdiff_t		static inline psched_tdiff_t

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ static u32 seq_scale(u32 seq)
	* overlaps less than one time per MSL (2 minutes).		* overlaps less than one time per MSL (2 minutes).
	* Choosing a clock of 64 ns period is OK. (period of 274 s)		* Choosing a clock of 64 ns period is OK. (period of 274 s)
	*/		*/
	return seq + (ktime_to_ns(ktime_get_real()) >> 6);		return seq + (ktime_get_real_ns() >> 6);
	}		}
	#endif		#endif

	@@ -135,7 +135,7 @@ u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
	md5_transform(hash, net_secret);		md5_transform(hash, net_secret);

	seq = hash[0] \| (((u64)hash[1]) << 32);		seq = hash[0] \| (((u64)hash[1]) << 32);
	seq += ktime_to_ns(ktime_get_real());		seq += ktime_get_real_ns();
	seq &= (1ull << 48) - 1;		seq &= (1ull << 48) - 1;

	return seq;		return seq;
	@@ -163,7 +163,7 @@ u64 secure_dccpv6_sequence_number(__be32 saddr, __be32 daddr,
	md5_transform(hash, secret);		md5_transform(hash, secret);

	seq = hash[0] \| (((u64)hash[1]) << 32);		seq = hash[0] \| (((u64)hash[1]) << 32);
	seq += ktime_to_ns(ktime_get_real());		seq += ktime_get_real_ns();
	seq &= (1ull << 48) - 1;		seq &= (1ull << 48) - 1;

	return seq;		return seq;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -358,7 +358,7 @@ bool nf_ct_delete(struct nf_conn *ct, u32 portid, int report)

	tstamp = nf_conn_tstamp_find(ct);		tstamp = nf_conn_tstamp_find(ct);
	if (tstamp && tstamp->stop == 0)		if (tstamp && tstamp->stop == 0)
	tstamp->stop = ktime_to_ns(ktime_get_real());		tstamp->stop = ktime_get_real_ns();

	if (nf_ct_is_dying(ct))		if (nf_ct_is_dying(ct))
	goto delete;		goto delete;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1737,7 +1737,7 @@ ctnetlink_create_conntrack(struct net *net, u16 zone,
	}		}
	tstamp = nf_conn_tstamp_find(ct);		tstamp = nf_conn_tstamp_find(ct);
	if (tstamp)		if (tstamp)
	tstamp->start = ktime_to_ns(ktime_get_real());		tstamp->start = ktime_get_real_ns();

	err = nf_conntrack_hash_check_insert(ct);		err = nf_conntrack_hash_check_insert(ct);
	if (err < 0)		if (err < 0)