diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-06 13:07:55 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-06 13:07:55 +0000 |
| commit | cedddd0bb5c808632ca226e9f66ab136098d1b2c (patch) | |
| tree | 971adb1381c693aa122361817677be4dc3cb3d50 /usr/src/uts/common/netinet | |
| parent | 91d2d9664188336e93786a92761888d1e299c88f (diff) | |
| parent | 015408caf0806500740413126a0215c7493f4bdf (diff) | |
| download | illumos-joyent-cedddd0bb5c808632ca226e9f66ab136098d1b2c.tar.gz | |
[illumos-gate merge]
commit 015408caf0806500740413126a0215c7493f4bdf
7934 sa_init() should use multi-threaded errno
commit 25d3556849fcbe4fe5d517e1add48e0b2d585c70
7933 libcfgadm: memory leak in do_list_common()
commit 89ac1330de393e78c8b27c33453223b10d3c18da
7932 cfgadm_plugins/shp: memory leaks in cfga_list_ext()
commit 39b16bd33a2633978bee6aed53e3afeb26399eb4
7840 Define uint16_t member in in6_addr
commit e1508819051004d7be493a04ee515905ae412142
6899 coverity problems in localedef
commit 8241ccbb39665a24ebedcca509f82ef3f0b6dd83
6470 mac_unregister() needs to mod_hash_remove() BEFORE holding the perimeter.
commit 6e28b3a925501ed4b842fd8e877e8a89989a4c5c
7897 loader.efi: Use 32-bit value for .text padding, for linker portability
commit e3ed3d332db66cf933650481f47832aaadb70ec3
7862 libdisasm: left shift of negative value
commit a536a2a3182b56eef2630fb4b4509c9e106655e6
7722 bootblock versioning needs to deal with missing data
commit baa708d63390757ca1a97444649f2fe4d3ae98f0
7926 enable gcc warnings for sd
Conflicts:
usr/src/uts/common/io/scsi/targets/sd.c
Diffstat (limited to 'usr/src/uts/common/netinet')
| -rw-r--r-- | usr/src/uts/common/netinet/in.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/uts/common/netinet/in.h b/usr/src/uts/common/netinet/in.h index 7927cf5e24..220537601a 100644 --- a/usr/src/uts/common/netinet/in.h +++ b/usr/src/uts/common/netinet/in.h @@ -118,9 +118,11 @@ struct in6_addr { */ #ifdef _KERNEL uint32_t _S6_u32[4]; /* IPv6 address */ + uint16_t _S6_u16[8]; /* IPv6 address */ uint8_t _S6_u8[16]; /* IPv6 address */ #else uint8_t _S6_u8[16]; /* IPv6 address */ + uint16_t _S6_u16[8]; /* IPv6 address */ uint32_t _S6_u32[4]; /* IPv6 address */ #endif uint32_t __S6_align; /* Align on 32 bit boundary */ @@ -130,6 +132,7 @@ struct in6_addr { #ifdef _KERNEL #define s6_addr8 _S6_un._S6_u8 +#define s6_addr16 _S6_un._S6_u16 #define s6_addr32 _S6_un._S6_u32 #endif |