[NET] Convert sk_rcvtstamp into SOCK_RCVTSTAMP flag

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index c8db2d9ef64d5cbdb7f44bcc5f24b960f3bbc85a..994ba0c83b1141106eccbc449f596653c5dfdccb 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -134,7 +134,6 @@ struct sock_common {
   *    @sk_sndbuf - size of send buffer in bytes
   *    @sk_flags - %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, %SO_OOBINLINE settings
   *    @sk_no_check - %SO_NO_CHECK setting, wether or not checkup packets
-  *    @sk_rcvtstamp - %SO_TIMESTAMP setting
   *    @sk_no_largesend - whether to sent large segments or not
   *    @sk_route_caps - route capabilities (e.g. %NETIF_F_TSO)
   *    @sk_lingertime - %SO_LINGER l_linger setting
@@ -207,7 +206,6 @@ struct sock {
        int                     sk_sndbuf;
        unsigned long           sk_flags;
        char                    sk_no_check;
-       unsigned char           sk_rcvtstamp;
        unsigned char           sk_no_largesend;
        int                     sk_route_caps;
        unsigned long           sk_lingertime;
@@ -388,6 +386,7 @@ enum sock_flags {
        SOCK_ZAPPED,
        SOCK_USE_WRITE_QUEUE, /* whether to call sk->sk_write_space in sock_wfree */
        SOCK_DBG, /* %SO_DEBUG setting */
+       SOCK_RCVTSTAMP, /* %SO_TIMESTAMP setting */
 };
 
 static inline void sock_set_flag(struct sock *sk, enum sock_flags flag)
@@ -1239,7 +1238,7 @@ static __inline__ void
 sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
 {
        struct timeval *stamp = &skb->stamp;
-       if (sk->sk_rcvtstamp) { 
+       if (sock_flag(sk, SOCK_RCVTSTAMP)) {
                /* Race occurred between timestamp enabling and packet
                   receiving.  Fill in the current time for now. */
                if (stamp->tv_sec == 0)

diff --git a/net/core/sock.c b/net/core/sock.c
index 6c5f84d5734c0cef2cb92a9f5123e224c4025037..15fc9cc99325961c0af221d4b881260da24d9391 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -342,9 +342,11 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
                        break;
 
                case SO_TIMESTAMP:
-                       sk->sk_rcvtstamp = valbool;
-                       if (valbool) 
+                       if (valbool)  {
+                               sock_set_flag(sk, SOCK_RCVTSTAMP);
                                sock_enable_timestamp(sk);
+                       } else
+                               sock_reset_flag(sk, SOCK_RCVTSTAMP);
                        break;
 
                case SO_RCVLOWAT:
@@ -528,7 +530,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                        break;
 
                case SO_TIMESTAMP:
-                       v.val = sk->sk_rcvtstamp;
+                       v.val = sock_flag(sk, SOCK_RCVTSTAMP);
                        break;
 
                case SO_RCVTIMEO: