diff options
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 73a4f9702a65..a6338d039857 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -301,7 +301,7 @@ struct sock { | |||
301 | const struct cred *sk_peer_cred; | 301 | const struct cred *sk_peer_cred; |
302 | long sk_rcvtimeo; | 302 | long sk_rcvtimeo; |
303 | long sk_sndtimeo; | 303 | long sk_sndtimeo; |
304 | struct sk_filter *sk_filter; | 304 | struct sk_filter __rcu *sk_filter; |
305 | void *sk_protinfo; | 305 | void *sk_protinfo; |
306 | struct timer_list sk_timer; | 306 | struct timer_list sk_timer; |
307 | ktime_t sk_stamp; | 307 | ktime_t sk_stamp; |
@@ -762,7 +762,7 @@ struct proto { | |||
762 | 762 | ||
763 | /* Memory pressure */ | 763 | /* Memory pressure */ |
764 | void (*enter_memory_pressure)(struct sock *sk); | 764 | void (*enter_memory_pressure)(struct sock *sk); |
765 | atomic_t *memory_allocated; /* Current allocated memory. */ | 765 | atomic_long_t *memory_allocated; /* Current allocated memory. */ |
766 | struct percpu_counter *sockets_allocated; /* Current number of sockets. */ | 766 | struct percpu_counter *sockets_allocated; /* Current number of sockets. */ |
767 | /* | 767 | /* |
768 | * Pressure flag: try to collapse. | 768 | * Pressure flag: try to collapse. |
@@ -771,7 +771,7 @@ struct proto { | |||
771 | * is strict, actions are advisory and have some latency. | 771 | * is strict, actions are advisory and have some latency. |
772 | */ | 772 | */ |
773 | int *memory_pressure; | 773 | int *memory_pressure; |
774 | int *sysctl_mem; | 774 | long *sysctl_mem; |
775 | int *sysctl_wmem; | 775 | int *sysctl_wmem; |
776 | int *sysctl_rmem; | 776 | int *sysctl_rmem; |
777 | int max_header; | 777 | int max_header; |