diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-15 12:38:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-15 12:38:38 -0800 |
| commit | 3313da8188cc346a205783c22c37e821b4b7016d (patch) | |
| tree | 5697cd985220def9bc2e35dfbb832dad04c2d051 /net/core | |
| parent | 50f444aa50a4f3fab35a04f56d6bb83dc1e8c875 (diff) | |
| parent | 24f0a48743a256bdec1bcb80708bc309da4aa261 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The netfilter conflicts were rather simple overlapping
changes.
However, the cls_tcindex.c stuff was a bit more complex.
On the 'net' side, Cong is fixing several races and memory
leaks. Whilst on the 'net-next' side we have Vlad adding
the rtnl-ness support.
What I've decided to do, in order to resolve this, is revert the
conversion over to using a workqueue that Cong did, bringing us back
to pure RCU. I did it this way because I believe that either Cong's
races don't apply with have Vlad did things, or Cong will have to
implement the race fix slightly differently.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 71ded4d8025c..d9f0a817dca8 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2475,7 +2475,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) } if (sk_has_memory_pressure(sk)) { - int alloc; + u64 alloc; if (!sk_under_memory_pressure(sk)) return 1; |