- Adds support for the multi-asconf (From Kozuka-san)

- Adds some prepwork (Not all yet) for vimage in particular
  support the delete the sctppcbinfo.xx structs. There is
  still a leak in here if it were to be called plus we stil
  need the regrouping (From Me and Michael Tuexen)
- Adds support for UDP tunneling. For BSD there is no
  socket yet setup so its disabled, but major argument
  changes are in here to emcompass the passing of the port
  number (zero when you don't have a udp tunnel, the default
  for BSD). Will add some hooks in UDP here shortly (discussed
  with Robert) that will allow easy tunneling. (Mainly from
  Peter Lei and Michael Tuexen with some BSD work from me :-D)
- Some ease for windows, evidently leave is reserved by their
  compile move label leave: -> out:

MFC after:	1 week

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h
index eeaca5d2efa0..95f3ed45b6bc 100644
--- a/sys/netinet/sctp_lock_bsd.h
+++ b/sys/netinet/sctp_lock_bsd.h
@@ -83,10 +83,10 @@ extern int sctp_logoff_stuff;
 #define SCTP_STATLOG_DESTROY()
 
 #define SCTP_INP_INFO_LOCK_DESTROY() do { \
-        if(rw_wowned(sctppcbinfo.ipi_ep_mtx)) { \
+        if(rw_wowned(&sctppcbinfo.ipi_ep_mtx)) { \
              rw_wunlock(&sctppcbinfo.ipi_ep_mtx); \
         } \
-        rw_destroy(sctppcbinfo.ipi_ep_mtx); \
+        rw_destroy(&sctppcbinfo.ipi_ep_mtx); \
       }  while (0)
 
 #define SCTP_INP_INFO_LOCK_INIT() \
@@ -111,10 +111,10 @@ extern int sctp_logoff_stuff;
         rw_init(&sctppcbinfo.ipi_addr_mtx, "sctp-addr")
 
 #define SCTP_IPI_ADDR_DESTROY() do  { \
-        if(rw_wowned(sctppcbinfo.ipi_addr_mtx)) { \
+        if(rw_wowned(&sctppcbinfo.ipi_addr_mtx)) { \
              rw_wunlock(&sctppcbinfo.ipi_addr_mtx); \
         } \
-	rw_destroy(&sctppcbinfo.ipi_addr_mtx) \
+	rw_destroy(&sctppcbinfo.ipi_addr_mtx); \
       }  while (0)