git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
net
/
rxrpc
/
conn_event.c
diff --git
a/net/rxrpc/conn_event.c
b/net/rxrpc/conn_event.c
index 4ca11be6be3cadcfda93eab7892292ca1ec127b5..b1dfae1074310299fb92a205483ba9437d639af2 100644
(file)
--- a/
net/rxrpc/conn_event.c
+++ b/
net/rxrpc/conn_event.c
@@
-460,6
+460,7
@@
void rxrpc_process_connection(struct work_struct *work)
case -EKEYEXPIRED:
case -EKEYREJECTED:
goto protocol_error;
+ case -ENOMEM:
case -EAGAIN:
goto requeue_and_leave;
case -ECONNABORTED: