summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorho <ho@openbsd.org>2001-05-16 12:48:31 +0000
committerho <ho@openbsd.org>2001-05-16 12:48:31 +0000
commitd424e204e60bfd7ffd01a57d3983f326a20fef28 (patch)
tree49e17bdb4138ce9da9ed97cdb6b57b088efe1497 /sys/netinet
parentdocument SMALL_KERNEL. (diff)
downloadwireguard-openbsd-d424e204e60bfd7ffd01a57d3983f326a20fef28.tar.xz
wireguard-openbsd-d424e204e60bfd7ffd01a57d3983f326a20fef28.zip
No need to check M_WAIT/M_WAITOK malloc return values. (art@ ok)
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in.c4
-rw-r--r--sys/netinet/ip_output.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 3237049f8c2..17ef1ebcb7d 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in.c,v 1.18 2000/10/06 05:52:00 itojun Exp $ */
+/* $OpenBSD: in.c,v 1.19 2001/05/16 12:53:35 ho Exp $ */
/* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */
/*
@@ -237,8 +237,6 @@ in_control(so, cmd, data, ifp)
if (ia == (struct in_ifaddr *)0) {
ia = (struct in_ifaddr *)
malloc(sizeof *ia, M_IFADDR, M_WAITOK);
- if (ia == (struct in_ifaddr *)0)
- return (ENOBUFS);
bzero((caddr_t)ia, sizeof *ia);
TAILQ_INSERT_TAIL(&in_ifaddr, ia, ia_list);
TAILQ_INSERT_TAIL(&ifp->if_addrlist, (struct ifaddr *)ia,
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index bef3b9beb6a..48d96b5452b 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.89 2001/04/14 00:30:59 angelos Exp $ */
+/* $OpenBSD: ip_output.c,v 1.90 2001/05/16 12:53:36 ho Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -1224,8 +1224,6 @@ ip_setmoptions(optname, imop, m)
imo = (struct ip_moptions *)malloc(sizeof(*imo), M_IPMOPTS,
M_WAITOK);
- if (imo == NULL)
- return (ENOBUFS);
*imop = imo;
imo->imo_multicast_ifp = NULL;
imo->imo_multicast_ttl = IP_DEFAULT_MULTICAST_TTL;