From be8c0575295c60f38c9d3ca7eb485103f96cf7cf Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sun, 24 Jun 2012 20:22:49 +0000 Subject: [PATCH] --- yaml --- r: 314580 b: refs/heads/master c: deaa58542b21d2b395db816952c202034319cbb4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/sock.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 00d270405e72..2570c741d3b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efc27f8ceebe5eb147fa31d6c995706d327ad855 +refs/heads/master: deaa58542b21d2b395db816952c202034319cbb4 diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 21086036e348..dcb54a0793ec 100644 --- a/trunk/include/net/sock.h +++ b/trunk/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;