summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/net/if_bridge.c8
-rw-r--r--sys/net/if_ethersubr.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index d507ec0bc34..4f8327bb1ba 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.159 2007/05/15 20:14:48 claudio Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.160 2007/05/16 20:27:58 michele Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -1013,13 +1013,13 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
sc = (struct bridge_softc *)ifp->if_bridge;
if (sc == NULL) {
m_freem(m);
- return (0);
+ return (EINVAL);
}
if (m->m_len < sizeof(*eh)) {
m = m_pullup(m, sizeof(*eh));
if (m == NULL)
- return (0);
+ return (ENOBUFS);
}
eh = mtod(m, struct ether_header *);
dst = (struct ether_addr *)&eh->ether_dhost[0];
@@ -1148,7 +1148,7 @@ sendunicast:
if ((dst_if->if_flags & IFF_RUNNING) == 0) {
m_freem(m);
splx(s);
- return (0);
+ return (ENETDOWN);
}
bridge_ifenqueue(sc, dst_if, m);
splx(s);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 4818545a3ca..9399c0f8b00 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.107 2007/05/16 09:24:07 dlg Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.108 2007/05/16 20:27:58 michele Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -443,7 +443,7 @@ ether_output(ifp0, m0, dst, rt0)
}
bcopy(&ifp->if_bridge, mtag + 1, sizeof(caddr_t));
m_tag_prepend(m, mtag);
- bridge_output(ifp, m, NULL, NULL);
+ error = bridge_output(ifp, m, NULL, NULL);
return (error);
}
}