Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d7b70fb authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Johannes Berg
Browse files

net: Mac80211: Remove silly timespec dance 



Converting time from one format to another seems to give coders a warm
and fuzzy feeling.

Use the proper interfaces.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John W. Linville <linville@tuxdriver.com>
[fix compile error]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3283e286

net/mac80211/status.c

+2 −5
Original line number Diff line number Diff line
@@ -473,8 +473,6 @@ static void ieee80211_tx_latency_end_msrmnt(struct ieee80211_local *local, 
					    struct sta_info *sta,

					    struct ieee80211_hdr *hdr)

{

	ktime_t skb_dprt;

	struct timespec dprt_time;

	u32 msrmnt;

	u16 tid;

	u8 *qc;
@@ -506,9 +504,8 @@ static void ieee80211_tx_latency_end_msrmnt(struct ieee80211_local *local, 


	tx_lat = &sta->tx_lat[tid];



	ktime_get_ts(&dprt_time); /* time stamp completion time */

	skb_dprt = ktime_set(dprt_time.tv_sec, dprt_time.tv_nsec);

	msrmnt = ktime_to_ms(ktime_sub(skb_dprt, skb_arv));

	/* Calculate the latency */

	msrmnt = ktime_to_ms(ktime_sub(ktime_get(), skb_arv));



	if (tx_lat->max < msrmnt) /* update stats */

		tx_lat->max = msrmnt;

net/mac80211/tx.c

+1 −4
Original line number Diff line number Diff line
@@ -1770,15 +1770,12 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, 
static void ieee80211_tx_latency_start_msrmnt(struct ieee80211_local *local,

					      struct sk_buff *skb)

{

	struct timespec skb_arv;

	struct ieee80211_tx_latency_bin_ranges *tx_latency;



	tx_latency = rcu_dereference(local->tx_latency);

	if (!tx_latency)

		return;



	ktime_get_ts(&skb_arv);

	skb->tstamp = ktime_set(skb_arv.tv_sec, skb_arv.tv_nsec);

	skb->tstamp = ktime_get();

}



/**