summaryrefslogtreecommitdiff
path: root/sys/net/if_bridge.c
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2000-11-10 05:24:59 +0000
committerJason Wright <jason@cvs.openbsd.org>2000-11-10 05:24:59 +0000
commitf91cf11249e4623c059580cde42b114ba785b2c5 (patch)
treec1c2a8b01a4c9eafa3c44777b87654f758c00d6a /sys/net/if_bridge.c
parent3e222ea23769f7fa61220327392152acedf527bf (diff)
it doesn't matter what kind of interface it is if the bridge_iflist allocation
fails.. it's still ENOMEM.
Diffstat (limited to 'sys/net/if_bridge.c')
-rw-r--r--sys/net/if_bridge.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 74810198d69..54c9e275ff4 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.41 2000/11/07 05:38:53 jason Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.42 2000/11/10 05:24:58 jason Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -319,9 +319,10 @@ bridge_ioctl(ifp, cmd, data)
p = (struct bridge_iflist *) malloc(
sizeof(struct bridge_iflist), M_DEVBUF, M_NOWAIT);
- if (p == NULL && ifs->if_type == IFT_ETHER) {
+ if (p == NULL) {
+ if (ifs->if_type == IFT_ETHER)
+ ifpromisc(ifs, 0);
error = ENOMEM;
- ifpromisc(ifs, 0);
break;
}