diff mbox series

net: remove unused TCPF_TSQ_DEFERRED

Message ID 8d326eb1-03de-6b8b-009e-7365255dd271@kernel.dk (mailing list archive)
State Rejected
Delegated to: Netdev Maintainers
Headers show
Series net: remove unused TCPF_TSQ_DEFERRED | expand

Checks

Context Check Description
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 2345 this patch: 2345
netdev/cc_maintainers warning 5 maintainers not CCed: davem@davemloft.net yoshfuji@linux-ipv6.org kuba@kernel.org pabeni@redhat.com dsahern@kernel.org
netdev/build_clang success Errors and warnings before: 583 this patch: 583
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 2472 this patch: 2472
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 26 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/tree_selection success Guessing tree name failed - patch did not apply, async

Commit Message

Jens Axboe March 26, 2022, 3:57 p.m. UTC 
tcp_release_cb() checks for this flag, but nobody is setting it. Just
kill it off.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

---

Comments

Jens Axboe March 26, 2022, 4:19 p.m. UTC | #1 
On 3/26/22 9:57 AM, Jens Axboe wrote:
> tcp_release_cb() checks for this flag, but nobody is setting it. Just
> kill it off.

Should've checked closer, bit TCP_TSQ_DEFERRED can be set of course.
So just disregard this one, sorry for the noise!
diff mbox series

Patch

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 78b91bb92f0d..7d803ab7da45 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -428,7 +428,6 @@  enum tsq_enum {
 enum tsq_flags {
 	TSQF_THROTTLED			= (1UL << TSQ_THROTTLED),
 	TSQF_QUEUED			= (1UL << TSQ_QUEUED),
-	TCPF_TSQ_DEFERRED		= (1UL << TCP_TSQ_DEFERRED),
 	TCPF_WRITE_TIMER_DEFERRED	= (1UL << TCP_WRITE_TIMER_DEFERRED),
 	TCPF_DELACK_TIMER_DEFERRED	= (1UL << TCP_DELACK_TIMER_DEFERRED),
 	TCPF_MTU_REDUCED_DEFERRED	= (1UL << TCP_MTU_REDUCED_DEFERRED),
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 5079832af5c1..a53bc45a2053 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1064,8 +1064,7 @@  static void tcp_tasklet_func(struct tasklet_struct *t)
 	}
 }
 
-#define TCP_DEFERRED_ALL (TCPF_TSQ_DEFERRED |		\
-			  TCPF_WRITE_TIMER_DEFERRED |	\
+#define TCP_DEFERRED_ALL (TCPF_WRITE_TIMER_DEFERRED |	\
 			  TCPF_DELACK_TIMER_DEFERRED |	\
 			  TCPF_MTU_REDUCED_DEFERRED)
 /**
@@ -1087,10 +1086,6 @@  void tcp_release_cb(struct sock *sk)
 		nflags = flags & ~TCP_DEFERRED_ALL;
 	} while (cmpxchg(&sk->sk_tsq_flags, flags, nflags) != flags);
 
-	if (flags & TCPF_TSQ_DEFERRED) {
-		tcp_tsq_write(sk);
-		__sock_put(sk);
-	}
 	/* Here begins the tricky part :
 	 * We are called from release_sock() with :
 	 * 1) BH disabled