C. Fraire's code review fixes
8529 Extended and regular SADB_ACQUIREs should share address extension code
Portions contributed by: Bayard Bell <buffer.g.overflow@gmail.com>

*** 566,584 ****
          iacqf_t *sdb_acq;
          int     sdb_hashsize;
  } sadb_t;
  
  /*
!  * A pair of SADB's (one for v4, one for v6), and related state (including
!  * acquire callbacks).
   */
  
  typedef struct sadbp_s
  {
          uint32_t        s_satype;
          uint32_t        *s_acquire_timeout;
-         void            (*s_acqfn)(ipsacq_t *, mblk_t *, netstack_t *);
          sadb_t          s_v4;
          sadb_t          s_v6;
          uint32_t        s_addflags;
          uint32_t        s_updateflags;
  } sadbp_t;
--- 566,582 ----
          iacqf_t *sdb_acq;
          int     sdb_hashsize;
  } sadb_t;
  
  /*
!  * A pair of SADB's (one for v4, one for v6), and related state.
   */
  
  typedef struct sadbp_s
  {
          uint32_t        s_satype;
          uint32_t        *s_acquire_timeout;
          sadb_t          s_v4;
          sadb_t          s_v6;
          uint32_t        s_addflags;
          uint32_t        s_updateflags;
  } sadbp_t;
*** 771,781 ****
  void cbc_params_init(ipsa_t *, uchar_t *, uint_t, uchar_t *, ipsa_cm_mech_t *,
      crypto_data_t *);
  
  void sadb_destroy_acquire(ipsacq_t *, netstack_t *);
  struct ipsec_stack;
- mblk_t *sadb_setup_acquire(ipsacq_t *, uint8_t, struct ipsec_stack *);
  ipsa_t *sadb_getspi(keysock_in_t *, uint32_t, int *, netstack_t *, uint_t);
  void sadb_in_acquire(sadb_msg_t *, sadbp_t *, queue_t *, netstack_t *);
  boolean_t sadb_replay_check(ipsa_t *, uint32_t);
  boolean_t sadb_replay_peek(ipsa_t *, uint32_t);
  int sadb_dump(queue_t *, mblk_t *, keysock_in_t *, sadb_t *);
--- 769,778 ----