[DCCP] packet_history: convert dccphrx_tstamp to ktime_t

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 10 insertions, 11 deletions

diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index 174d3f13d93f..40ad428a27f5 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -125,14 +125,14 @@ static int dccp_li_hist_interval_new(struct list_head *list,
  * returns estimated loss interval in usecs */
 static u32 dccp_li_calc_first_li(struct sock *sk,
                                  struct list_head *hist_list,
-                                 struct timeval *last_feedback,
+                                 ktime_t last_feedback,
                                  u16 s, u32 bytes_recv,
                                  u32 previous_x_recv)
 {
         struct dccp_rx_hist_entry *entry, *next, *tail = NULL;
         u32 x_recv, p;
         suseconds_t rtt, delta;
-        struct timeval tstamp = { 0, 0 };
+        ktime_t tstamp = ktime_set(0, 0);
         int interval = 0;
         int win_count = 0;
         int step = 0;
@@ -176,7 +176,7 @@ found:
                 return ~0;
         }
 
-        delta = timeval_delta(&tstamp, &tail->dccphrx_tstamp);
+        delta = ktime_us_delta(tstamp, tail->dccphrx_tstamp);
         DCCP_BUG_ON(delta < 0);
 
         rtt = delta * 4 / interval;
@@ -196,8 +196,7 @@ found:
                 return ~0;
         }
 
-        dccp_timestamp(sk, &tstamp);
-        delta = timeval_delta(&tstamp, last_feedback);
+        delta = ktime_us_delta(ktime_get_real(), last_feedback);
         DCCP_BUG_ON(delta <= 0);
 
         x_recv = scaled_div32(bytes_recv, delta);
@@ -226,7 +225,7 @@ found:
 void dccp_li_update_li(struct sock *sk,
                        struct list_head *li_hist_list,
                        struct list_head *hist_list,
-                       struct timeval *last_feedback, u16 s, u32 bytes_recv,
+                       ktime_t last_feedback, u16 s, u32 bytes_recv,
                        u32 previous_x_recv, u64 seq_loss, u8 win_loss)
 {
         struct dccp_li_hist_entry *head;
diff --git a/net/dccp/ccids/lib/loss_interval.h b/net/dccp/ccids/lib/loss_interval.h
index 906c806d6d9d..27bee92dae13 100644
--- a/net/dccp/ccids/lib/loss_interval.h
+++ b/net/dccp/ccids/lib/loss_interval.h
@@ -13,8 +13,8 @@
  *  any later version.
  */
 
+#include <linux/ktime.h>
 #include <linux/list.h>
-#include <linux/time.h>
 
 extern void dccp_li_hist_purge(struct list_head *list);
 
@@ -23,7 +23,7 @@ extern u32 dccp_li_hist_calc_i_mean(struct list_head *list);
 extern void dccp_li_update_li(struct sock *sk,
                               struct list_head *li_hist_list,
                               struct list_head *hist_list,
-                              struct timeval *last_feedback, u16 s,
+                              ktime_t last_feedback, u16 s,
                               u32 bytes_recv, u32 previous_x_recv,
                               u64 seq_loss, u8 win_loss);
 #endif /* _DCCP_LI_HIST_ */
diff --git a/net/dccp/ccids/lib/packet_history.h b/net/dccp/ccids/lib/packet_history.h
index 60d00f015390..d9d68964d952 100644
--- a/net/dccp/ccids/lib/packet_history.h
+++ b/net/dccp/ccids/lib/packet_history.h
@@ -37,6 +37,7 @@
 #ifndef _DCCP_PKT_HIST_
 #define _DCCP_PKT_HIST_
 
+#include <linux/ktime.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/time.h>
@@ -124,7 +125,7 @@ struct dccp_rx_hist_entry {
                          dccphrx_ccval:4,
                          dccphrx_type:4;
         u32              dccphrx_ndp; /* In fact it is from 8 to 24 bits */
-        struct timeval   dccphrx_tstamp;
+        ktime_t          dccphrx_tstamp;
 };
 
 struct dccp_rx_hist {
@@ -136,7 +137,6 @@ extern void 		dccp_rx_hist_delete(struct dccp_rx_hist *hist);
 
 static inline struct dccp_rx_hist_entry *
                         dccp_rx_hist_entry_new(struct dccp_rx_hist *hist,
-                                               const struct sock *sk,
                                                const u32 ndp,
                                                const struct sk_buff *skb,
                                                const gfp_t prio)
@@ -151,7 +151,7 @@ static inline struct dccp_rx_hist_entry *
                 entry->dccphrx_ccval = dh->dccph_ccval;
                 entry->dccphrx_type  = dh->dccph_type;
                 entry->dccphrx_ndp   = ndp;
-                dccp_timestamp(sk, &entry->dccphrx_tstamp);
+                entry->dccphrx_tstamp = ktime_get_real();
         }
 
         return entry;