Bayard's initial drop, needs finishing, or at least testing.

*** 19,28 ****
--- 19,29 ----
   * CDDL HEADER END
   */
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  * Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved.
   */
  
  #ifndef _INET_IPSEC_IMPL_H
  #define _INET_IPSEC_IMPL_H
  
*** 783,793 ****
  /* spd.c */
          /*
           * Because policy needs to know what algorithms are supported, keep the
           * lists of algorithms here.
           */
!         kmutex_t                ipsec_alg_lock;
  
          uint8_t                 ipsec_nalgs[IPSEC_NALGTYPES];
          ipsec_alginfo_t *ipsec_alglists[IPSEC_NALGTYPES][IPSEC_MAX_ALGS];
  
          uint8_t         ipsec_sortlist[IPSEC_NALGTYPES][IPSEC_MAX_ALGS];
--- 784,794 ----
  /* spd.c */
          /*
           * Because policy needs to know what algorithms are supported, keep the
           * lists of algorithms here.
           */
!         krwlock_t               ipsec_alg_lock;
  
          uint8_t                 ipsec_nalgs[IPSEC_NALGTYPES];
          ipsec_alginfo_t *ipsec_alglists[IPSEC_NALGTYPES][IPSEC_MAX_ALGS];
  
          uint8_t         ipsec_sortlist[IPSEC_NALGTYPES][IPSEC_MAX_ALGS];