diff options
| author | archie <archie@FreeBSD.org> | 2000-01-28 00:50:28 +0000 |
|---|---|---|
| committer | archie <archie@FreeBSD.org> | 2000-01-28 00:50:28 +0000 |
| commit | ee893a1be4164307e665a5d6a2c387b84ec50e9b (patch) | |
| tree | 61bb70bfbd5292061af4c305a3bb8efc7a8a5d41 /usr.sbin | |
| parent | f31600a4538b8a34be7a762a8a9e2279f278f5fd (diff) | |
| download | FreeBSD-src-ee893a1be4164307e665a5d6a2c387b84ec50e9b.zip FreeBSD-src-ee893a1be4164307e665a5d6a2c387b84ec50e9b.tar.gz | |
No need to try loading ng_socket.ko, as NgMkSockNode() does that
for us now if necessary.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ngctl/main.c | 11 | ||||
| -rw-r--r-- | usr.sbin/ngctl/ngctl.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c index 74017e7..70080f9 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 8c7155b..1baced7 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> |
