[src/netbsd-7]: src/sys Pull up following revision(s) (requested by rmind in ...

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

details:   https://anonhg.NetBSD.org/src/rev/b29b7ad3680a
branches:  netbsd-7
changeset: 798328:b29b7ad3680a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Sep 08 19:12:04 2014 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #80):
        sys/netinet6/in6_pcb.c: revision 1.129
        sys/netinet/in_pcb.c: revision 1.152
in_pcbdetach: move ip_freemoptions() under softnet_lock for now (this will
be changed back once other IP paths become MP-safe).  Same for IPv6 routine.
This partially reverts 1.150 of in_pcb.c and 1.127 of in6_pcb.c changes.

diffstat:

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

diffs (58 lines):

diff -r bc3285662d9c -r b29b7ad3680a sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c      Mon Sep 08 19:09:07 2014 +0000
+++ b/sys/netinet/in_pcb.c      Mon Sep 08 19:12:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_pcb.c,v 1.151 2014/08/05 05:24:26 rtr Exp $ */
+/*     $NetBSD: in_pcb.c,v 1.151.2.1 2014/09/08 19:12:04 msaitoh Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.151 2014/08/05 05:24:26 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.151.2.1 2014/09/08 19:12:04 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -606,9 +606,9 @@
                m_free(inp->inp_options);
        }
        rtcache_free(&inp->inp_route);
+       ip_freemoptions(inp->inp_moptions);
        sofree(so);                     /* drops the socket's lock */
 
-       ip_freemoptions(inp->inp_moptions);
        pool_put(&inpcb_pool, inp);
        mutex_enter(softnet_lock);      /* reacquire the softnet_lock */
 }
diff -r bc3285662d9c -r b29b7ad3680a sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c    Mon Sep 08 19:09:07 2014 +0000
+++ b/sys/netinet6/in6_pcb.c    Mon Sep 08 19:12:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_pcb.c,v 1.128 2014/08/05 05:24:27 rtr Exp $        */
+/*     $NetBSD: in6_pcb.c,v 1.128.2.1 2014/09/08 19:12:04 msaitoh Exp $        */
 /*     $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128 2014/08/05 05:24:27 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128.2.1 2014/09/08 19:12:04 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -617,9 +617,9 @@
                free(in6p->in6p_outputopts, M_IP6OPT);
        }
        rtcache_free(&in6p->in6p_route);
+       ip6_freemoptions(in6p->in6p_moptions);
        sofree(so);                             /* drops the socket's lock */
 
-       ip6_freemoptions(in6p->in6p_moptions);
        pool_put(&in6pcb_pool, in6p);
        mutex_enter(softnet_lock);              /* reacquire it */
 }