diff --git a/[refs] b/[refs] index 53f8ba0b96c4..1698b7bb81a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be02097cf6342eb0426833f54c95e0fb4c9bca45 +refs/heads/master: 4e07a91c37c69ec1647c218214591ee4fe3408fe diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 689b886038da..dfeb8b13024f 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -218,13 +218,13 @@ struct sock { atomic_t sk_rmem_alloc; atomic_t sk_wmem_alloc; atomic_t sk_omem_alloc; + int sk_sndbuf; struct sk_buff_head sk_receive_queue; struct sk_buff_head sk_write_queue; struct sk_buff_head sk_async_wait_queue; int sk_wmem_queued; int sk_forward_alloc; gfp_t sk_allocation; - int sk_sndbuf; int sk_route_caps; int sk_gso_type; int sk_rcvlowat;