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/davem/net
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
inet_connection_sock.c
diff --git
a/net/ipv4/inet_connection_sock.c
b/net/ipv4/inet_connection_sock.c
index 786d97aee751e2f2206b9e3b66398bc0995cc645..6acb541c90910204f02449e7500138362da6998a 100644
(file)
--- a/
net/ipv4/inet_connection_sock.c
+++ b/
net/ipv4/inet_connection_sock.c
@@
-559,7
+559,7
@@
static inline void syn_ack_recalc(struct request_sock *req, const int thresh,
int inet_rtx_syn_ack(struct sock *parent, struct request_sock *req)
{
- int err = req->rsk_ops->rtx_syn_ack(parent, req
, NULL
);
+ int err = req->rsk_ops->rtx_syn_ack(parent, req);
if (!err)
req->num_retrans++;