net: struct sock cleanups

Add missing kernel doc for sk_rx_dst

Move sk_rx_dst to avoid two 32bit holes on 64bit arches

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index 21086036e348dce616d6ff4933077c4aca8035fa..dcb54a0793ece6d9de2389fe9a181b4b8e17eb1a 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -198,6 +198,7 @@ struct cg_proto;
   *    @sk_lock:       synchronizer
   *    @sk_rcvbuf: size of receive buffer in bytes
   *    @sk_wq: sock wait queue and async head
+  *    @sk_rx_dst: receive input route used by early tcp demux
   *    @sk_dst_cache: destination cache
   *    @sk_dst_lock: destination cache lock
   *    @sk_policy: flow policy
@@ -317,9 +318,9 @@ struct sock {
        struct xfrm_policy      *sk_policy[2];
 #endif
        unsigned long           sk_flags;
+       struct dst_entry        *sk_rx_dst;
        struct dst_entry        *sk_dst_cache;
        spinlock_t              sk_dst_lock;
-       struct dst_entry        *sk_rx_dst;
        atomic_t                sk_wmem_alloc;
        atomic_t                sk_omem_alloc;
        int                     sk_sndbuf;