diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 07:33:03 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 07:33:03 -0500 |
| commit | d37fb92326da880947d4dd72684ef1dd2d245727 (patch) | |
| tree | 9f16c2061f5f1be6c02c355335645a17abb62f0e /include/net/sock.h | |
| parent | b272efc8600a7bbf2dd91d0eba8a3b8949e84497 (diff) | |
| parent | 1023dbd90c1e3e87921198939917c1f50b4b6af7 (diff) | |
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-arizona
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 93a6745bfdb2..182ca99405ad 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -367,7 +367,7 @@ struct sock { | |||
| 367 | unsigned short sk_ack_backlog; | 367 | unsigned short sk_ack_backlog; |
| 368 | unsigned short sk_max_ack_backlog; | 368 | unsigned short sk_max_ack_backlog; |
| 369 | __u32 sk_priority; | 369 | __u32 sk_priority; |
| 370 | #ifdef CONFIG_CGROUPS | 370 | #if IS_ENABLED(CONFIG_NETPRIO_CGROUP) |
| 371 | __u32 sk_cgrp_prioidx; | 371 | __u32 sk_cgrp_prioidx; |
| 372 | #endif | 372 | #endif |
| 373 | struct pid *sk_peer_pid; | 373 | struct pid *sk_peer_pid; |