[src/trunk]: src/sys In the case of SIOCDIFADDR, call pfil_run_addrhooks befo...

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/533ef45c7041
branches:  trunk
changeset: 820132:533ef45c7041
user:      ryo <ryo%NetBSD.org@localhost>
date:      Sat Dec 31 09:41:05 2016 +0000

description:
In the case of SIOCDIFADDR, call pfil_run_addrhooks before release ia.

diffstat:

 sys/netinet/in.c   |  6 +++---
 sys/netinet6/in6.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 5729719c124f -r 533ef45c7041 sys/netinet/in.c
--- a/sys/netinet/in.c  Fri Dec 30 22:40:23 2016 +0000
+++ b/sys/netinet/in.c  Sat Dec 31 09:41:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.193 2016/12/27 10:53:11 ozaki-r Exp $ */
+/*     $NetBSD: in.c,v 1.194 2016/12/31 09:41:05 ryo Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.193 2016/12/27 10:53:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.194 2016/12/31 09:41:05 ryo Exp $");
 
 #include "arp.h"
 
@@ -668,10 +668,10 @@
                break;
 
        case SIOCDIFADDR:
+               pfil_run_addrhooks(if_pfil, cmd, iatoifa(ia));
                ia4_release(ia, &psref);
                in_purgeaddr(&ia->ia_ifa);
                ia = NULL;
-               run_hook = true;
                break;
 
 #ifdef MROUTING
diff -r 5729719c124f -r 533ef45c7041 sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Fri Dec 30 22:40:23 2016 +0000
+++ b/sys/netinet6/in6.c        Sat Dec 31 09:41:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6.c,v 1.227 2016/12/27 10:53:12 ozaki-r Exp $        */
+/*     $NetBSD: in6.c,v 1.228 2016/12/31 09:41:05 ryo Exp $    */
 /*     $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $   */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.227 2016/12/27 10:53:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.228 2016/12/31 09:41:05 ryo Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -709,10 +709,10 @@
        }
 
        case SIOCDIFADDR_IN6:
+               pfil_run_addrhooks(if_pfil, cmd, (struct ifaddr *)ia);
                ia6_release(ia, &psref);
                in6_purgeaddr(&ia->ia_ifa);
                ia = NULL;
-               run_hooks = true;
                break;
 
        default: