From aab00cabb70866ccdc7128715e08c157c4b48cf9 Mon Sep 17 00:00:00 2001
From: Zhiyi Pan <zhiyi.pan@uber.com>
Date: Mon, 21 Aug 2023 16:03:34 -0700
Subject: [PATCH] Simplify ListenAndServe

---
 channel.go | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/channel.go b/channel.go
index ae4209da..cca873de 100644
--- a/channel.go
+++ b/channel.go
@@ -415,15 +415,9 @@ func (ch *Channel) ListenAndServe(hostPort string) error {
 		return errAlreadyListening
 	}
 
-	var l net.Listener
-	var err error
-	if ch.enableMPTCP {
-		lc := &net.ListenConfig{}
-		lc.SetMultipathTCP(true)
-		l, err = lc.Listen(context.Background(), "tcp", hostPort)
-	} else {
-		l, err = net.Listen("tcp", hostPort)
-	}
+	lc := net.ListenConfig{}
+	lc.SetMultipathTCP(ch.enableMPTCP)
+	l, err := lc.Listen(context.Background(), "tcp", hostPort)
 	if err != nil {
 		mutable.RUnlock()
 		return err