Module Name: src
Committed By: ozaki-r
Date: Fri Sep 12 03:44:27 UTC 2014
Modified Files:
src/sys/net: if_vlan.c
Log Message:
Restore vlan_ioctl overwritten by ether_ifdetach in vlan_unconfig
This fixes PR 49112.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 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.70 src/sys/net/if_vlan.c:1.71
--- src/sys/net/if_vlan.c:1.70 Tue May 13 19:36:16 2014
+++ src/sys/net/if_vlan.c Fri Sep 12 03:44:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.70 2014/05/13 19:36:16 bouyer Exp $ */
+/* $NetBSD: if_vlan.c,v 1.71 2014/09/12 03:44:27 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.70 2014/05/13 19:36:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.71 2014/09/12 03:44:27 ozaki-r Exp $");
#include "opt_inet.h"
@@ -384,6 +384,8 @@ vlan_unconfig(struct ifnet *ifp)
}
ether_ifdetach(ifp);
+ /* Restore vlan_ioctl overwritten by ether_ifdetach */
+ ifp->if_ioctl = vlan_ioctl;
vlan_reset_linkname(ifp);
break;
}
