Print this page
11378 ncec_last_time_defended needs to be clock_t
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Approved by:

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/inet/ip_ndp.h
          +++ new/usr/src/uts/common/inet/ip_ndp.h
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
       26 +/*
       27 + * Copyright 2019 Joyent, Inc.
       28 + */
       29 +
  26   30  #ifndef _INET_IP_NDP_H
  27   31  #define _INET_IP_NDP_H
  28   32  
  29   33  #include <sys/mutex.h>
  30   34  #include <sys/stream.h>
  31   35  #include <netinet/in.h>
  32   36  #include <netinet/icmp6.h>
  33   37  #include <inet/ip.h>
  34   38  #include <inet/ip2mac.h>
  35   39  
↓ open down ↓ 40 lines elided ↑ open up ↑
  76   80          uchar_t         *ncec_lladdr;
  77   81          mblk_t          *ncec_qd_mp;    /* Head outgoing queued packets */
  78   82          uint64_t        ncec_last;      /* Time last reachable in msec */
  79   83          uint32_t        ncec_refcnt;    /* ncec active usage count */
  80   84          kmutex_t        ncec_lock;      /* See comments on top for what */
  81   85                                          /* this field protects */
  82   86          int             ncec_unsolicit_count; /* Unsolicited Adv count */
  83   87          timeout_id_t    ncec_timeout_id;
  84   88          uchar_t         ncec_ipversion; /* IPv4(ARP)/IPv6(NDP) version */
  85   89          uint_t          ncec_defense_count;     /* number of NDP conflicts */
  86      -        uint_t          ncec_last_time_defended; /* last time defended (secs) */
       90 +        clock_t         ncec_last_time_defended; /* defended last (ticks) */
  87   91          uint64_t        ncec_init_time; /* time when it was set to ND_INITIAL */
  88   92          boolean_t       ncec_trace_disable;     /* True when alloc fails */
  89   93          /*
  90   94           * interval to keep track of DAD probes.
  91   95           */
  92   96          clock_t         ncec_xmit_interval;
  93   97          ip_stack_t      *ncec_ipst;     /* Does not have a netstack_hold */
  94   98          list_t          ncec_cb;        /* callbacks waiting for resolution */
  95   99          uint_t          ncec_cb_walker_cnt;
  96  100          uint_t          ncec_nprobes;
↓ open down ↓ 249 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX