diff options
author | Eric Dumazet <edumazet@google.com> | 2012-06-24 16:22:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-25 19:09:18 -0400 |
commit | deaa58542b21d2b395db816952c202034319cbb4 (patch) | |
tree | 55d720f117845dda6f141490b0e4dde4b4c9127c /include/net/sock.h | |
parent | efc27f8ceebe5eb147fa31d6c995706d327ad855 (diff) |
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>
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 21086036e348..dcb54a0793ec 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -198,6 +198,7 @@ struct cg_proto; | |||
198 | * @sk_lock: synchronizer | 198 | * @sk_lock: synchronizer |
199 | * @sk_rcvbuf: size of receive buffer in bytes | 199 | * @sk_rcvbuf: size of receive buffer in bytes |
200 | * @sk_wq: sock wait queue and async head | 200 | * @sk_wq: sock wait queue and async head |
201 | * @sk_rx_dst: receive input route used by early tcp demux | ||
201 | * @sk_dst_cache: destination cache | 202 | * @sk_dst_cache: destination cache |
202 | * @sk_dst_lock: destination cache lock | 203 | * @sk_dst_lock: destination cache lock |
203 | * @sk_policy: flow policy | 204 | * @sk_policy: flow policy |
@@ -317,9 +318,9 @@ struct sock { | |||
317 | struct xfrm_policy *sk_policy[2]; | 318 | struct xfrm_policy *sk_policy[2]; |
318 | #endif | 319 | #endif |
319 | unsigned long sk_flags; | 320 | unsigned long sk_flags; |
321 | struct dst_entry *sk_rx_dst; | ||
320 | struct dst_entry *sk_dst_cache; | 322 | struct dst_entry *sk_dst_cache; |
321 | spinlock_t sk_dst_lock; | 323 | spinlock_t sk_dst_lock; |
322 | struct dst_entry *sk_rx_dst; | ||
323 | atomic_t sk_wmem_alloc; | 324 | atomic_t sk_wmem_alloc; |
324 | atomic_t sk_omem_alloc; | 325 | atomic_t sk_omem_alloc; |
325 | int sk_sndbuf; | 326 | int sk_sndbuf; |