diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-31 15:11:44 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-31 15:11:44 -0400 |
| commit | 44718a59413a47c80c33db3abcb35a46c94588c8 (patch) | |
| tree | b0d3f610618787b0c1ccc374e7e8c17f626cf639 | |
| parent | 50fcf615f5e7ffff0f7b797313f9b070d561d066 (diff) | |
| download | longterm-queue-5.2-44718a59413a47c80c33db3abcb35a46c94588c8.tar.gz | |
net: inet-sock: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-refactor-bind_bucket-fastreuse-into-helper.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch b/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch index 69394d79..ded86cf5 100644 --- a/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch +++ b/queue/net-refactor-bind_bucket-fastreuse-into-helper.patch @@ -1,4 +1,4 @@ -From 62ffc589abb176821662efc4525ee4ac0b9c3894 Mon Sep 17 00:00:00 2001 +From fef0107b568cfc97dcef86cfa66b310324ec62cf Mon Sep 17 00:00:00 2001 From: Tim Froidcoeur <tim.froidcoeur@tessares.net> Date: Tue, 11 Aug 2020 20:33:23 +0200 Subject: [PATCH] net: refactor bind_bucket fastreuse into helper @@ -13,12 +13,12 @@ Signed-off-by: Tim Froidcoeur <tim.froidcoeur@tessares.net> Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h -index 1e209ce7d1bd..aa8893c68c50 100644 +index c57d53e7e02c..1ba40380b4df 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h -@@ -304,6 +304,10 @@ void inet_csk_listen_stop(struct sock *sk); - - void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr); +@@ -309,6 +309,10 @@ int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname, + int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname, + char __user *optval, unsigned int optlen); +/* update the fast reuse flag when adding a socket */ +void inet_csk_update_fastreuse(struct inet_bind_bucket *tb, @@ -28,10 +28,10 @@ index 1e209ce7d1bd..aa8893c68c50 100644 #define TCP_PINGPONG_THRESH 3 diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c -index d1a3913eebe0..b457dd2d6c75 100644 +index 9f7dc49d761a..92b31d251da8 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c -@@ -296,6 +296,57 @@ static inline int sk_reuseport_match(struct inet_bind_bucket *tb, +@@ -284,6 +284,57 @@ static inline int sk_reuseport_match(struct inet_bind_bucket *tb, ipv6_only_sock(sk), true, false); } @@ -89,7 +89,7 @@ index d1a3913eebe0..b457dd2d6c75 100644 /* Obtain a reference to a local port for the given sock, * if snum is zero it means select any available local port. * We try to allocate an odd port (and leave even ports for connect()) -@@ -308,7 +359,6 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) +@@ -296,7 +347,6 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) struct inet_bind_hashbucket *head; struct net *net = sock_net(sk); struct inet_bind_bucket *tb = NULL; @@ -97,7 +97,7 @@ index d1a3913eebe0..b457dd2d6c75 100644 int l3mdev; l3mdev = inet_sk_bound_l3mdev(sk); -@@ -345,49 +395,8 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) +@@ -333,49 +383,8 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) goto fail_unlock; } success: |