summaryrefslogtreecommitdiff
path: root/privs.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-07-30 14:54:31 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-07-30 14:54:31 +0200
commitd19a87a0b2d6c8a282a04ef80bee5a3b9f4547a1 (patch)
treeedefb0359c8eaf1792438aefd05dff2e202bb1ee /privs.h
parent9b0949b728eae42550e5adc6ff67063499d53044 (diff)
sock: Avoid setting negative socket memory values
When getting of the initial values fails in set_system_socket_memory(), we store -1 for the values. Avoid writing these back (and causing an error message) when calling reset_system_socket_memory(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'privs.h')
0 files changed, 0 insertions, 0 deletions
ac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/afs/Makefile')