[DCCP]: Nuke the timeval helpers now that we fully converted to ktime_t

[linux-2.6] / net / dccp / dccp.h

diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index d8ad27bfe01a1d16bf50f17b92589be6988993ee..ddacc23be5e84128075d06135f4614acfa76f620 100644 (file)
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -13,6 +13,7 @@
  */
 
 #include <linux/dccp.h>
+#include <linux/ktime.h>
 #include <net/snmp.h>
 #include <net/sock.h>
 #include <net/tcp.h>
@@ -184,7 +185,7 @@ DECLARE_SNMP_STAT(struct dccp_mib, dccp_statistics);
 /*
  *     Checksumming routines
  */
-static inline int dccp_csum_coverage(const struct sk_buff *skb)
+static inline unsigned int dccp_csum_coverage(const struct sk_buff *skb)
 {
        const struct dccp_hdr* dh = dccp_hdr(skb);
 
@@ -195,7 +196,7 @@ static inline int dccp_csum_coverage(const struct sk_buff *skb)
 
 static inline void dccp_csum_outgoing(struct sk_buff *skb)
 {
-       int cov = dccp_csum_coverage(skb);
+       unsigned int cov = dccp_csum_coverage(skb);
 
        if (cov >= skb->len)
                dccp_hdr(skb)->dccph_cscov = 0;
@@ -296,8 +297,8 @@ extern int     dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr,
 extern int        dccp_send_reset(struct sock *sk, enum dccp_reset_codes code);
 extern void       dccp_send_close(struct sock *sk, const int active);
 extern int        dccp_invalid_packet(struct sk_buff *skb);
-extern u32        dccp_sample_rtt(struct sock *sk, struct timeval *t_recv,
-                                                   struct timeval *t_history);
+extern u32        dccp_sample_rtt(struct sock *sk, ktime_t t_recv,
+                                  ktime_t *t_history);
 
 static inline int dccp_bad_service_code(const struct sock *sk,
                                        const __be32 service)
@@ -401,47 +402,6 @@ extern int dccp_insert_option(struct sock *sk, struct sk_buff *skb,
                               unsigned char option,
                               const void *value, unsigned char len);
 
-extern void dccp_timestamp(const struct sock *sk, struct timeval *tv);
-
-static inline suseconds_t timeval_usecs(const struct timeval *tv)
-{
-       return tv->tv_sec * USEC_PER_SEC + tv->tv_usec;
-}
-
-static inline suseconds_t timeval_delta(const struct timeval *large,
-                                       const struct timeval *small)
-{
-       time_t      secs  = large->tv_sec  - small->tv_sec;
-       suseconds_t usecs = large->tv_usec - small->tv_usec;
-
-       if (usecs < 0) {
-               secs--;
-               usecs += USEC_PER_SEC;
-       }
-       return secs * USEC_PER_SEC + usecs;
-}
-
-static inline void timeval_add_usecs(struct timeval *tv,
-                                    const suseconds_t usecs)
-{
-       tv->tv_usec += usecs;
-       while (tv->tv_usec >= USEC_PER_SEC) {
-               tv->tv_sec++;
-               tv->tv_usec -= USEC_PER_SEC;
-       }
-}
-
-static inline void timeval_sub_usecs(struct timeval *tv,
-                                    const suseconds_t usecs)
-{
-       tv->tv_usec -= usecs;
-       while (tv->tv_usec < 0) {
-               tv->tv_sec--;
-               tv->tv_usec += USEC_PER_SEC;
-       }
-       DCCP_BUG_ON(tv->tv_sec < 0);
-}
-
 #ifdef CONFIG_SYSCTL
 extern int dccp_sysctl_init(void);
 extern void dccp_sysctl_exit(void);