projects
/
firefly-linux-kernel-4.4.55.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/pkl/squashfs-linus
[firefly-linux-kernel-4.4.55.git]
/
net
/
x25
/
x25_timer.c
diff --git
a/net/x25/x25_timer.c
b/net/x25/x25_timer.c
index d3e3e54db936a738d13de9756799796b40dc9dc3..5c5db1a36399d1ef26d24df168ceb47b871b1e3d 100644
(file)
--- a/
net/x25/x25_timer.c
+++ b/
net/x25/x25_timer.c
@@
-113,7
+113,7
@@
static void x25_heartbeat_expiry(unsigned long param)
(sk->sk_state == TCP_LISTEN &&
sock_flag(sk, SOCK_DEAD))) {
bh_unlock_sock(sk);
- x25_destroy_socket(sk);
+ x25_destroy_socket
_from_timer
(sk);
return;
}
break;