From 2c47de02675501ba925e71319fc1399cf83b6113 Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@gmail.com>
Date: Wed, 18 Dec 2024 14:03:11 -0600
Subject: [PATCH] chore: remove usage of wsconn in favor of websocket

---
 tailnet/derp.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tailnet/derp.go b/tailnet/derp.go
index 6c8e363e91e29..0d87157e75e75 100644
--- a/tailnet/derp.go
+++ b/tailnet/derp.go
@@ -10,7 +10,6 @@ import (
 
 	"nhooyr.io/websocket"
 	"tailscale.com/derp"
-	"tailscale.com/net/wsconn"
 )
 
 // WithWebsocketSupport returns an http.Handler that upgrades
@@ -60,7 +59,7 @@ func WithWebsocketSupport(s *derp.Server, base http.Handler) (http.Handler, func
 				c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")
 				return
 			}
-			wc := wsconn.NetConn(ctx, c, websocket.MessageBinary)
+			wc := websocket.NetConn(ctx, c, websocket.MessageBinary)
 			brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))
 			s.Accept(ctx, wc, brw, r.RemoteAddr)
 		}), func() {