summaryrefslogtreecommitdiffstats
path: root/sys/netiso
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netiso')
-rw-r--r--sys/netiso/clnp_raw.c4
-rw-r--r--sys/netiso/esis.c14
-rw-r--r--sys/netiso/if_cons.c4
-rw-r--r--sys/netiso/iso.c4
-rw-r--r--sys/netiso/tp.trans14
-rw-r--r--sys/netiso/tp_driver.c14
-rw-r--r--sys/netiso/tp_subr.c9
-rw-r--r--sys/netiso/tp_usrreq.c5
8 files changed, 26 insertions, 42 deletions
diff --git a/sys/netiso/clnp_raw.c b/sys/netiso/clnp_raw.c
index 67694c2b68d..287f31d7494 100644
--- a/sys/netiso/clnp_raw.c
+++ b/sys/netiso/clnp_raw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clnp_raw.c,v 1.2 1996/03/04 10:34:59 mickey Exp $ */
+/* $OpenBSD: clnp_raw.c,v 1.3 2001/05/16 12:54:06 ho Exp $ */
/* $NetBSD: clnp_raw.c,v 1.9 1996/02/13 22:08:42 christos Exp $ */
/*-
@@ -314,8 +314,6 @@ clnp_usrreq(so, req, m, nam, control)
if (rp)
panic("rip_attach");
MALLOC(rp, struct rawisopcb *, sizeof *rp, M_PCB, M_WAITOK);
- if (rp == 0)
- return (ENOBUFS);
bzero(rp, sizeof *rp);
so->so_pcb = rp;
break;
diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c
index 10b4b86674e..6cf5d0a0409 100644
--- a/sys/netiso/esis.c
+++ b/sys/netiso/esis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esis.c,v 1.4 1996/05/10 12:31:21 deraadt Exp $ */
+/* $OpenBSD: esis.c,v 1.5 2001/05/16 12:54:06 ho Exp $ */
/* $NetBSD: esis.c,v 1.14 1996/05/07 02:45:04 thorpej Exp $ */
/*-
@@ -184,13 +184,11 @@ esis_usrreq(so, req, m, nam, control)
break;
}
MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
- if ((so->so_pcb = rp) != NULL) {
- bzero(so->so_pcb, sizeof(*rp));
- LIST_INSERT_HEAD(&esis_pcb, rp, rcb_list);
- rp->rcb_socket = so;
- error = soreserve(so, esis_sendspace, esis_recvspace);
- } else
- error = ENOBUFS;
+ so->so_pcb = rp;
+ bzero(so->so_pcb, sizeof(*rp));
+ LIST_INSERT_HEAD(&esis_pcb, rp, rcb_list);
+ rp->rcb_socket = so;
+ error = soreserve(so, esis_sendspace, esis_recvspace);
break;
case PRU_SEND:
diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c
index 99af200fc70..4c7dc72fa03 100644
--- a/sys/netiso/if_cons.c
+++ b/sys/netiso/if_cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cons.c,v 1.2 1996/03/04 10:35:21 mickey Exp $ */
+/* $OpenBSD: if_cons.c,v 1.3 2001/05/16 12:54:07 ho Exp $ */
/* $NetBSD: if_cons.c,v 1.7 1996/02/13 22:09:44 christos Exp $ */
/*-
@@ -595,8 +595,6 @@ make_partial_x25_packet(isop, lcp)
return 0;
}
MGETHDR(m, M_WAITOK, MT_DATA);
- if (m == 0)
- return ENOBUFS;
buf = mtod(m, caddr_t);
ptr = buf;
diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c
index b9385efee65..c11334c58e9 100644
--- a/sys/netiso/iso.c
+++ b/sys/netiso/iso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iso.c,v 1.3 1996/04/21 22:29:25 deraadt Exp $ */
+/* $OpenBSD: iso.c,v 1.4 2001/05/16 12:54:07 ho Exp $ */
/* $NetBSD: iso.c,v 1.14 1996/04/13 01:34:48 cgd Exp $ */
/*-
@@ -488,8 +488,6 @@ iso_control(so, cmd, data, ifp)
#endif
MALLOC(ia, struct iso_ifaddr *, sizeof(*ia),
M_IFADDR, M_WAITOK);
- if (ia == 0)
- return (ENOBUFS);
bzero((caddr_t) ia, sizeof(*ia));
TAILQ_INSERT_TAIL(&iso_ifaddr, ia, ia_list);
TAILQ_INSERT_TAIL(&ifp->if_addrlist, (struct ifaddr *) ia,
diff --git a/sys/netiso/tp.trans b/sys/netiso/tp.trans
index f8ec072e064..7101080e1a0 100644
--- a/sys/netiso/tp.trans
+++ b/sys/netiso/tp.trans
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp.trans,v 1.2 1996/03/04 10:35:46 mickey Exp $ */
+/* $OpenBSD: tp.trans,v 1.3 2001/05/16 12:54:07 ho Exp $ */
/* $NetBSD: tp.trans,v 1.4 1994/06/29 06:39:55 cgd Exp $ */
/* NEW */
@@ -420,13 +420,11 @@ TP_CRSENT <== TP_CLOSED T_CONN_req
$P.tp_ucddata, 0, 0);
ENDTRACE
data = MCPY($P.tp_ucddata, M_WAIT);
- if (data) {
- IFDEBUG(D_CONN)
- printf("T_CONN_req.trans m_copy cc 0x%x\n",
- $P.tp_ucddata);
- dump_mbuf(data, "sosnd @ T_CONN_req");
- ENDDEBUG
- }
+ IFDEBUG(D_CONN)
+ printf("T_CONN_req.trans m_copy cc 0x%x\n",
+ $P.tp_ucddata);
+ dump_mbuf(data, "sosnd @ T_CONN_req");
+ ENDDEBUG
if (error = tp_emit(CR_TPDU_type, $P, 0, 0, data) )
return error; /* driver WON'T change state; will return error */
diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c
index 55db1bde56d..c2df0f0ee08 100644
--- a/sys/netiso/tp_driver.c
+++ b/sys/netiso/tp_driver.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_driver.c,v 1.4 1998/04/04 02:55:57 don Exp $ */
+/* $OpenBSD: tp_driver.c,v 1.5 2001/05/16 12:54:07 ho Exp $ */
/* $NetBSD: tp_driver.c,v 1.8 1996/03/16 23:13:45 christos Exp $ */
#include "tp_states.h"
@@ -161,15 +161,13 @@ _Xebec_action(a, e, p)
(int) p->tp_flags, p->tp_ucddata, 0, 0);
#endif
data = MCPY(p->tp_ucddata, M_WAIT);
- if (data) {
#ifdef ARGO_DEBUG
- if (argo_debug[D_CONN]) {
- printf("T_CONN_req.trans m_copy cc %p\n",
- p->tp_ucddata);
- dump_mbuf(data, "sosnd @ T_CONN_req");
- }
-#endif
+ if (argo_debug[D_CONN]) {
+ printf("T_CONN_req.trans m_copy cc %p\n",
+ p->tp_ucddata);
+ dump_mbuf(data, "sosnd @ T_CONN_req");
}
+#endif
if ((error = tp_emit(CR_TPDU_type, p, 0, 0, data)) != 0)
return error; /* driver WON'T change state;
* will return error */
diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c
index 602b452fc84..73bcff21107 100644
--- a/sys/netiso/tp_subr.c
+++ b/sys/netiso/tp_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_subr.c,v 1.3 1996/04/21 22:29:57 deraadt Exp $ */
+/* $OpenBSD: tp_subr.c,v 1.4 2001/05/16 12:54:07 ho Exp $ */
/* $NetBSD: tp_subr.c,v 1.8 1996/03/16 23:14:00 christos Exp $ */
/*-
@@ -721,10 +721,9 @@ tp_packetize(tpcb, m, eotsdu)
while (m) {
n = m;
- if (totlen > maxsize) {
- if ((m = m_split(n, maxsize, M_WAIT)) == 0)
- panic("tp_packetize");
- } else
+ if (totlen > maxsize)
+ m = m_split(n, maxsize, M_WAIT);
+ else
m = 0;
totlen -= maxsize;
tpsbcheck(tpcb, 5);
diff --git a/sys/netiso/tp_usrreq.c b/sys/netiso/tp_usrreq.c
index 7c6f03cec22..8b3e4caf987 100644
--- a/sys/netiso/tp_usrreq.c
+++ b/sys/netiso/tp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_usrreq.c,v 1.3 1996/04/21 22:30:04 deraadt Exp $ */
+/* $OpenBSD: tp_usrreq.c,v 1.4 2001/05/16 12:54:07 ho Exp $ */
/* $NetBSD: tp_usrreq.c,v 1.9 1996/03/16 23:14:06 christos Exp $ */
/*-
@@ -329,9 +329,6 @@ tp_sendoob(tpcb, so, xdata, outflags)
if (xdata == (struct mbuf *) 0) {
/* empty xpd packet */
MGETHDR(xdata, M_WAIT, MT_OOBDATA);
- if (xdata == NULL) {
- return ENOBUFS;
- }
xdata->m_len = 0;
xdata->m_pkthdr.len = 0;
}
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.