*** 18,28 ****
   *
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-  * Copyright 2015, Joyent, Inc.
   */
  
  #ifndef _UDP_IMPL_H
  #define _UDP_IMPL_H
  
--- 18,27 ----
*** 177,192 ****
  
          uint32_t
                  udp_issocket : 1,       /* socket mode; sockfs is on top */
                  udp_nat_t_endpoint : 1, /* UDP_NAT_T_ENDPOINT option */
                  udp_rcvhdr : 1,         /* UDP_RCVHDR option */
-                 udp_vxlanhash: 1,       /* UDP_SRCPORT_HASH option */
-                                         /* Because there's only VXLAN, cheat */
-                                         /* and only use a single bit */
                  udp_snd_to_conn: 1,     /* UDP_SND_TO_CONNECTED option */
  
!                 udp_pad_to_bit_31 : 27;
  
          /* Following 2 fields protected by the uf_lock */
          struct udp_s    *udp_bind_hash; /* Bind hash chain */
          struct udp_s    **udp_ptpbhn; /* Pointer to previous bind hash next. */
  
--- 176,188 ----
  
          uint32_t
                  udp_issocket : 1,       /* socket mode; sockfs is on top */
                  udp_nat_t_endpoint : 1, /* UDP_NAT_T_ENDPOINT option */
                  udp_rcvhdr : 1,         /* UDP_RCVHDR option */
                  udp_snd_to_conn: 1,     /* UDP_SND_TO_CONNECTED option */
  
!                 udp_pad_to_bit_31 : 28;
  
          /* Following 2 fields protected by the uf_lock */
          struct udp_s    *udp_bind_hash; /* Bind hash chain */
          struct udp_s    **udp_ptpbhn; /* Pointer to previous bind hash next. */