From b08b2814a15fc6787d631469e1a7f0e49216e66b Mon Sep 17 00:00:00 2001
From: Archie Cobbs <archie@FreeBSD.org>
Date: Fri, 28 Jan 2000 00:50:28 +0000
Subject: [PATCH] No need to try loading ng_socket.ko, as NgMkSockNode() does
 that for us now if necessary.

---
 usr.sbin/ngctl/main.c  | 11 +----------
 usr.sbin/ngctl/ngctl.h |  1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index 74017e77085f..70080f9680dd 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -43,7 +43,6 @@
 #define PROMPT			"+ "
 #define MAX_ARGS		512
 #define WHITESPACE		" \t\r\n\v\f"
-#define NG_SOCKET_KLD		"ng_socket.ko"
 #define DUMP_BYTES_PER_LINE	16
 
 /* Internal functions */
@@ -143,16 +142,8 @@ main(int ac, char *av[])
 	av += optind;
 
 	/* Create a new socket node */
-	if (NgMkSockNode(name, &csock, &dsock) < 0) {
-		if (errno == EPROTONOSUPPORT) {
-			if (kldload(NG_SOCKET_KLD) < 0)
-				err(EX_OSERR, "can't load %s", NG_SOCKET_KLD);
-			if (NgMkSockNode(name, &csock, &dsock) >= 0)
-				goto gotNode;
-		}
+	if (NgMkSockNode(name, &csock, &dsock) < 0)
 		err(EX_OSERR, "can't create node");
-	}
-gotNode:
 
 	/* Do commands as requested */
 	if (ac == 0) {
diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h
index 8c7155b82744..1baced784c89 100644
--- a/usr.sbin/ngctl/ngctl.h
+++ b/usr.sbin/ngctl/ngctl.h
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/select.h>
-#include <sys/linker.h>
 
 #include <stdio.h>
 #include <stdlib.h>