diff --git a/[refs] b/[refs] index 002d96fb1459..5f227bede4de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4412cb8a6b4190cf73ae44c859fd7e3727d8b13 +refs/heads/master: 2378982487c492541d17adc0a870e7e83b07ba43 diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 08291c1be41e..8b2b82131b67 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -239,7 +239,9 @@ struct sock { int sk_sndbuf; struct sk_buff_head sk_receive_queue; struct sk_buff_head sk_write_queue; +#ifdef CONFIG_NET_DMA struct sk_buff_head sk_async_wait_queue; +#endif int sk_wmem_queued; int sk_forward_alloc; gfp_t sk_allocation;