xnu-4570.51.1.tar.gz

[apple/xnu.git] / bsd / netinet6 / mld6_var.h

diff --git a/bsd/netinet6/mld6_var.h b/bsd/netinet6/mld6_var.h
index 249506b8545edfaddfd696b8865646a95e282478..c7623ea8de20c8cf22d491752816c9f1ade2553b 100644 (file)
--- a/bsd/netinet6/mld6_var.h
+++ b/bsd/netinet6/mld6_var.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2017 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -90,6 +90,7 @@ struct mld_ifinfo_u {
 
 #define MLIF_SILENT    0x00000001      /* Do not use MLD on this ifp */
 #define MLIF_USEALLOW  0x00000002      /* Use ALLOW/BLOCK for joins/leaves */
 
 #define MLIF_SILENT    0x00000001      /* Do not use MLD on this ifp */
 #define MLIF_USEALLOW  0x00000002      /* Use ALLOW/BLOCK for joins/leaves */

+#define        MLIF_PROCESSED  0x00000004      /* Entry has been processed and can be skipped */

 
 /*
  * MLD version tag.
 
 /*
  * MLD version tag.


@@ -193,10 +194,10 @@ struct mld_ifinfo {
 };
 
 #define        MLI_LOCK_ASSERT_HELD(_mli)                                      \
 };
 
 #define        MLI_LOCK_ASSERT_HELD(_mli)                                      \

-       lck_mtx_assert(&(_mli)->mli_lock, LCK_MTX_ASSERT_OWNED)
+       LCK_MTX_ASSERT(&(_mli)->mli_lock, LCK_MTX_ASSERT_OWNED)

 
 #define        MLI_LOCK_ASSERT_NOTHELD(_mli)                                   \
 
 #define        MLI_LOCK_ASSERT_NOTHELD(_mli)                                   \

-       lck_mtx_assert(&(_mli)->mli_lock, LCK_MTX_ASSERT_NOTOWNED)
+       LCK_MTX_ASSERT(&(_mli)->mli_lock, LCK_MTX_ASSERT_NOTOWNED)

 
 #define        MLI_LOCK(_mli)                                                  \
        lck_mtx_lock(&(_mli)->mli_lock)
 
 #define        MLI_LOCK(_mli)                                                  \
        lck_mtx_lock(&(_mli)->mli_lock)