Module Name: src
Committed By: ozaki-r
Date: Mon Sep 15 05:54:02 UTC 2014
Modified Files:
src/sys/net: if_vlan.c
Log Message:
Leave promiscuous mode when detaching a parent (ifconfig -vlanif)
We have to call ifpromisc(ifp, 0) for both a VLAN interface
and its parent when they are in promiscuous mode.
PR 49196
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/net/if_vlan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.72 src/sys/net/if_vlan.c:1.73
--- src/sys/net/if_vlan.c:1.72 Fri Sep 12 04:10:24 2014
+++ src/sys/net/if_vlan.c Mon Sep 15 05:54:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.72 2014/09/12 04:10:24 ozaki-r Exp $ */
+/* $NetBSD: if_vlan.c,v 1.73 2014/09/15 05:54:02 ozaki-r Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.72 2014/09/12 04:10:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.73 2014/09/15 05:54:02 ozaki-r Exp $");
#include "opt_inet.h"
@@ -400,6 +400,8 @@ vlan_unconfig(struct ifnet *ifp)
ifv->ifv_if.if_mtu = 0;
ifv->ifv_flags = 0;
+ if ((ifp->if_flags & IFF_PROMISC) != 0)
+ ifpromisc(ifp, 0);
if_down(ifp);
ifp->if_flags &= ~(IFF_UP|IFF_RUNNING);
ifp->if_capabilities = 0;
@@ -484,6 +486,9 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
if ((error = copyin(ifr->ifr_data, &vlr, sizeof(vlr))) != 0)
break;
if (vlr.vlr_parent[0] == '\0') {
+ if (ifv->ifv_p != NULL &&
+ (ifp->if_flags & IFF_PROMISC) != 0)
+ error = ifpromisc(ifv->ifv_p, 0);
vlan_unconfig(ifp);
break;
}
