[src/trunk]: src/sys/net Restore vlan_ioctl overwritten by ether_ifdetach in ...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f429cdb7381e
branches:  trunk
changeset: 332218:f429cdb7381e
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Sep 12 03:44:27 2014 +0000

description:
Restore vlan_ioctl overwritten by ether_ifdetach in vlan_unconfig

This fixes PR 49112.

diffstat:

 sys/net/if_vlan.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r b9c43291c8b0 -r f429cdb7381e sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Thu Sep 11 21:04:34 2014 +0000
+++ b/sys/net/if_vlan.c Fri Sep 12 03:44:27 2014 +0000
@@ -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 @@
                }
 
                ether_ifdetach(ifp);
+               /* Restore vlan_ioctl overwritten by ether_ifdetach */
+               ifp->if_ioctl = vlan_ioctl;
                vlan_reset_linkname(ifp);
                break;
            }