This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index c2f958c..5d97894 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -569,8 +569,6 @@ struct proto {
        kmem_cache_t            *slab;
        int                     slab_obj_size;
 
-       struct module           *owner;
-
        char                    name[32];
 
        struct {
@@ -1299,7 +1297,19 @@ static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb)
        __kfree_skb(skb);
 }
 
+extern atomic_t netstamp_needed;
 extern void sock_enable_timestamp(struct sock *sk);
+
+static inline void net_timestamp(struct timeval *stamp) 
+{ 
+       if (atomic_read(&netstamp_needed)) 
+               do_gettimeofday(stamp);
+       else {
+               stamp->tv_sec = 0;
+               stamp->tv_usec = 0;
+       }               
+} 
+
 extern int sock_get_timestamp(struct sock *, struct timeval __user *);
 
 /* 
@@ -1349,13 +1359,6 @@ static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool)
 extern __u32 sysctl_wmem_max;
 extern __u32 sysctl_rmem_max;
 
-#ifdef CONFIG_NET
 int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
-#else
-static inline int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-       return -ENODEV;
-}
-#endif
 
 #endif /* _SOCK_H */