projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'clk-doc', 'clk-more-critical', 'clk-meson' and 'clk-basic-be' into...
[linux-2.6-microblaze.git]
/
net
/
rxrpc
/
peer_event.c
diff --git
a/net/rxrpc/peer_event.c
b/net/rxrpc/peer_event.c
index
bc05af8
..
6e84d87
100644
(file)
--- a/
net/rxrpc/peer_event.c
+++ b/
net/rxrpc/peer_event.c
@@
-157,6
+157,11
@@
void rxrpc_error_report(struct sock *sk)
_enter("%p{%d}", sk, local->debug_id);
_enter("%p{%d}", sk, local->debug_id);
+ /* Clear the outstanding error value on the socket so that it doesn't
+ * cause kernel_sendmsg() to return it later.
+ */
+ sock_error(sk);
+
skb = sock_dequeue_err_skb(sk);
if (!skb) {
_leave("UDP socket errqueue empty");
skb = sock_dequeue_err_skb(sk);
if (!skb) {
_leave("UDP socket errqueue empty");