1 files changed, 4 insertions, 6 deletions

diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index e67a8ada235f..1e6f19b47707 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -572,14 +572,12 @@ tunioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		if (tp->tun_if.if_flags & IFF_UP)
 			return(EBUSY);
 
-		switch (*(int *)data) {
+		switch (*(int *)data & ~IFF_MULTICAST) {
 		case IFF_POINTOPOINT:
-			tp->tun_if.if_flags |= IFF_POINTOPOINT;
-			tp->tun_if.if_flags &= ~IFF_BROADCAST;
-			break;
 		case IFF_BROADCAST:
-			tp->tun_if.if_flags &= ~IFF_POINTOPOINT;
-			tp->tun_if.if_flags |= IFF_BROADCAST;
+			tp->tun_if.if_flags &=
+			    ~(IFF_BROADCAST|IFF_POINTOPOINT|IFF_MULTICAST);
+			tp->tun_if.if_flags |= *(int *)data;
 			break;
 		default:
 			return(EINVAL);