summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorozaki-r <ozaki-r@NetBSD.org>2014-10-11 10:18:36 +0000
committerozaki-r <ozaki-r@NetBSD.org>2014-10-11 10:18:36 +0000
commitb07fa576b1ead6ddb09b29d41bc2a7dcb2aba0af (patch)
tree2b02116c2eff9dd85fd4d12ed15eb16cc8e136ce /sys/net
parent3718f78a90c326e9e689168a7bccb2d76b1da3e9 (diff)
Tweak vlan_unconfig
No functional change.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_vlan.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 5aca856094b..f88ca8e2394 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.76 2014/10/11 10:16:49 ozaki-r Exp $ */
+/* $NetBSD: if_vlan.c,v 1.77 2014/10/11 10:18:36 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.76 2014/10/11 10:16:49 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.77 2014/10/11 10:18:36 ozaki-r Exp $");
#include "opt_inet.h"
@@ -362,10 +362,12 @@ static void
vlan_unconfig(struct ifnet *ifp)
{
struct ifvlan *ifv = ifp->if_softc;
+ struct ifnet *p;
mutex_enter(&ifv_mtx);
+ p = ifv->ifv_p;
- if (ifv->ifv_p == NULL) {
+ if (p == NULL) {
mutex_exit(&ifv_mtx);
return;
}
@@ -378,20 +380,18 @@ vlan_unconfig(struct ifnet *ifp)
(*ifv->ifv_msw->vmsw_purgemulti)(ifv);
/* Disconnect from parent. */
- switch (ifv->ifv_p->if_type) {
+ switch (p->if_type) {
case IFT_ETHER:
{
- struct ethercom *ec = (void *) ifv->ifv_p;
+ struct ethercom *ec = (void *) p;
if (ec->ec_nvlans-- == 1) {
/*
* Disable Tx/Rx of VLAN-sized frames.
*/
ec->ec_capenable &= ~ETHERCAP_VLAN_MTU;
- if (ifv->ifv_p->if_flags & IFF_UP) {
- (void)if_flags_set(ifv->ifv_p,
- ifv->ifv_p->if_flags);
- }
+ if (p->if_flags & IFF_UP)
+ (void)if_flags_set(p, p->if_flags);
}
ether_ifdetach(ifp);