xnu-4903.270.47.tar.gz

[apple/xnu.git] / bsd / net / if_llreach.h

diff --git a/bsd/net/if_llreach.h b/bsd/net/if_llreach.h
index c27ff9dedef173a1c8c55b9f11250d6eb976a754..42c9f6ddd00b13faebb28e3b49ba88aed201ca65 100644 (file)
--- a/bsd/net/if_llreach.h
+++ b/bsd/net/if_llreach.h
@@ -26,8 +26,8 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 

-#ifndef        _NET_IF_LLREACH_H_
-#define        _NET_IF_LLREACH_H_
+#ifndef _NET_IF_LLREACH_H_
+#define _NET_IF_LLREACH_H_

 
 #ifdef PRIVATE
 #ifdef  __cplusplus
 
 #ifdef PRIVATE
 #ifdef  __cplusplus


@@ -39,21 +39,21 @@ extern "C" {
 /*
  * Per-interface link-layer reachability information (private).
  */
 /*
  * Per-interface link-layer reachability information (private).
  */

-#define        IF_LLREACHINFO_ADDRLEN          64      /* max ll addr len */
-#define        IF_LLREACHINFO_RESERVED2        16      /* more reserved bits */
+#define IF_LLREACHINFO_ADDRLEN          64      /* max ll addr len */
+#define IF_LLREACHINFO_RESERVED2        16      /* more reserved bits */

 
 struct if_llreach_info {
 
 struct if_llreach_info {

-       u_int32_t               lri_refcnt;     /* reference count */
-       u_int32_t               lri_ifindex;    /* interface index */
-       u_int64_t               lri_expire;     /* expiration (calendar) time */
-       u_int32_t               lri_probes;     /* total # of probes */
-       u_int16_t               lri_reserved;   /* for future use */
-       u_int16_t               lri_proto;      /* ll proto */
-       u_int8_t                lri_addr[IF_LLREACHINFO_ADDRLEN]; /* ll addr */
-       int32_t                 lri_rssi;       /* received signal strength */
-       int32_t                 lri_lqm;        /* link quality metric */
-       int32_t                 lri_npm;        /* node proximity metric */
-       u_int8_t                lri_reserved2[IF_LLREACHINFO_RESERVED2];
+       u_int32_t               lri_refcnt;     /* reference count */
+       u_int32_t               lri_ifindex;    /* interface index */
+       u_int64_t               lri_expire;     /* expiration (calendar) time */
+       u_int32_t               lri_probes;     /* total # of probes */
+       u_int16_t               lri_reserved;   /* for future use */
+       u_int16_t               lri_proto;      /* ll proto */
+       u_int8_t                lri_addr[IF_LLREACHINFO_ADDRLEN]; /* ll addr */
+       int32_t                 lri_rssi;       /* received signal strength */
+       int32_t                 lri_lqm;        /* link quality metric */
+       int32_t                 lri_npm;        /* node proximity metric */
+       u_int8_t                lri_reserved2[IF_LLREACHINFO_RESERVED2];

 };
 
 #ifdef XNU_KERNEL_PRIVATE
 };
 
 #ifdef XNU_KERNEL_PRIVATE


@@ -69,63 +69,63 @@ struct if_llreach_info {
 /*
  * Per-interface link-layer reachability.  (Currently only for ARP/NDP/Ethernet.)
  */
 /*
  * Per-interface link-layer reachability.  (Currently only for ARP/NDP/Ethernet.)
  */

-#define        IF_LLREACH_MAXLEN       ETHER_ADDR_LEN
+#define IF_LLREACH_MAXLEN       ETHER_ADDR_LEN

 
 struct if_llreach {
        decl_lck_mtx_data(, lr_lock);
 
 struct if_llreach {
        decl_lck_mtx_data(, lr_lock);

-       RB_ENTRY(if_llreach)    lr_link;        /* RB tree links */
-       struct ifnet            *lr_ifp;        /* back pointer to ifnet */
-       u_int32_t               lr_refcnt;      /* reference count */
-       u_int32_t               lr_reqcnt;      /* RB tree request count */
-       u_int32_t               lr_debug;       /* see ifa_debug flags */
-       u_int32_t               lr_probes;      /* number of probes so far */
-       u_int64_t               lr_basecal;     /* base calendar time */
-       u_int64_t               lr_baseup;      /* base uptime */
-       u_int64_t               lr_lastrcvd;    /* last-heard-of timestamp */
-       u_int32_t               lr_basereachable; /* baseline time */
-       u_int32_t               lr_reachable;   /* reachable time */
+       RB_ENTRY(if_llreach)    lr_link;        /* RB tree links */
+       struct ifnet            *lr_ifp;        /* back pointer to ifnet */
+       u_int32_t               lr_refcnt;      /* reference count */
+       u_int32_t               lr_reqcnt;      /* RB tree request count */
+       u_int32_t               lr_debug;       /* see ifa_debug flags */
+       u_int32_t               lr_probes;      /* number of probes so far */
+       u_int64_t               lr_basecal;     /* base calendar time */
+       u_int64_t               lr_baseup;      /* base uptime */
+       u_int64_t               lr_lastrcvd;    /* last-heard-of timestamp */
+       u_int32_t               lr_basereachable; /* baseline time */
+       u_int32_t               lr_reachable;   /* reachable time */

        struct lr_key_s {
        struct lr_key_s {

-               u_int16_t       proto;          /* ll proto */
-               u_int8_t        addr[IF_LLREACH_MAXLEN]; /* ll addr */
+               u_int16_t       proto;          /* ll proto */
+               u_int8_t        addr[IF_LLREACH_MAXLEN]; /* ll addr */

        } lr_key;
        } lr_key;

-       int32_t                 lr_rssi;        /* received signal strength */
-       int32_t                 lr_lqm;         /* link quality metric */
-       int32_t                 lr_npm;         /* node proximity metric */
+       int32_t                 lr_rssi;        /* received signal strength */
+       int32_t                 lr_lqm;         /* link quality metric */
+       int32_t                 lr_npm;         /* node proximity metric */

 };
 
 RB_PROTOTYPE_SC_PREV(__private_extern__, ll_reach_tree, if_llreach,
     ls_link, ifllr_cmp);
 
 };
 
 RB_PROTOTYPE_SC_PREV(__private_extern__, ll_reach_tree, if_llreach,
     ls_link, ifllr_cmp);
 

-#define        IFLR_LOCK_ASSERT_HELD(_iflr)                                    \
-       lck_mtx_assert(&(_iflr)->lr_lock, LCK_MTX_ASSERT_OWNED)
+#define IFLR_LOCK_ASSERT_HELD(_iflr)                                    \
+       LCK_MTX_ASSERT(&(_iflr)->lr_lock, LCK_MTX_ASSERT_OWNED)

 
 

-#define        IFLR_LOCK_ASSERT_NOTHELD(_iflr)                         \
-       lck_mtx_assert(&(_iflr)->lr_lock, LCK_MTX_ASSERT_NOTOWNED)
+#define IFLR_LOCK_ASSERT_NOTHELD(_iflr)                         \
+       LCK_MTX_ASSERT(&(_iflr)->lr_lock, LCK_MTX_ASSERT_NOTOWNED)

 
 

-#define        IFLR_LOCK(_iflr)                                                \
+#define IFLR_LOCK(_iflr)                                                \

        lck_mtx_lock(&(_iflr)->lr_lock)
 
        lck_mtx_lock(&(_iflr)->lr_lock)
 

-#define        IFLR_LOCK_SPIN(_iflr)                                           \
+#define IFLR_LOCK_SPIN(_iflr)                                           \

        lck_mtx_lock_spin(&(_iflr)->lr_lock)
 
        lck_mtx_lock_spin(&(_iflr)->lr_lock)
 

-#define        IFLR_CONVERT_LOCK(_iflr) do {                                   \
-       IFLR_LOCK_ASSERT_HELD(_iflr);                                   \
-       lck_mtx_convert_spin(&(_iflr)->lr_lock);                        \
+#define IFLR_CONVERT_LOCK(_iflr) do {                                   \
+       IFLR_LOCK_ASSERT_HELD(_iflr);                                   \
+       lck_mtx_convert_spin(&(_iflr)->lr_lock);                        \

 } while (0)
 
 } while (0)
 

-#define        IFLR_UNLOCK(_iflr)                                              \
+#define IFLR_UNLOCK(_iflr)                                              \

        lck_mtx_unlock(&(_iflr)->lr_lock)
 
        lck_mtx_unlock(&(_iflr)->lr_lock)
 

-#define        IFLR_ADDREF(_iflr)                                              \
+#define IFLR_ADDREF(_iflr)                                              \

        iflr_addref(_iflr, 0)
 
        iflr_addref(_iflr, 0)
 

-#define        IFLR_ADDREF_LOCKED(_iflr)                                       \
+#define IFLR_ADDREF_LOCKED(_iflr)                                       \

        iflr_addref(_iflr, 1)
 
        iflr_addref(_iflr, 1)
 

-#define        IFLR_REMREF(_iflr)                                              \
+#define IFLR_REMREF(_iflr)                                              \

        iflr_remref(_iflr)
 
        iflr_remref(_iflr)
 

-struct ifnet_llreach_info;     /* forward declaration */
+struct ifnet_llreach_info;      /* forward declaration */

 
 extern void ifnet_llreach_init(void);
 extern void ifnet_llreach_ifattach(struct ifnet *, boolean_t);
 
 extern void ifnet_llreach_init(void);
 extern void ifnet_llreach_ifattach(struct ifnet *, boolean_t);