Author: glebius
Date: Sat Aug 4 00:03:21 2018
New Revision: 337279
URL: https://svnweb.freebsd.org/changeset/base/337279
Log:
Now that after r335979 the kernel addresses in API structures are
fixed size, there is no reason left for the unions.
Discussed with: brooks
Modified:
head/sys/netinet/in_pcb.h
head/sys/sys/socketvar.h
Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h Fri Aug 3 22:55:58 2018 (r337278)
+++ head/sys/netinet/in_pcb.h Sat Aug 4 00:03:21 2018 (r337279)
@@ -370,10 +370,7 @@ struct xinpcb {
struct xsocket xi_socket; /* (s,p) */
struct in_conninfo inp_inc; /* (s,p) */
uint64_t inp_gencnt; /* (s,p) */
- union {
- kvaddr_t inp_ppcb; /* (s) netstat(1) */
- int64_t ph_ppcb;
- };
+ kvaddr_t inp_ppcb; /* (s) netstat(1) */
int64_t inp_spare64[4];
uint32_t inp_flow; /* (s) */
uint32_t inp_flowid; /* (s) */
Modified: head/sys/sys/socketvar.h
==============================================================================
--- head/sys/sys/socketvar.h Fri Aug 3 22:55:58 2018 (r337278)
+++ head/sys/sys/socketvar.h Sat Aug 4 00:03:21 2018 (r337279)
@@ -475,14 +475,8 @@ int accept_filt_generic_mod_event(module_t mod, int
ev
*/
struct xsocket {
ksize_t xso_len; /* length of this structure */
- union {
- kvaddr_t xso_so; /* kernel address of struct socket */
- int64_t ph_so;
- };
- union {
- kvaddr_t so_pcb; /* kernel address of struct inpcb */
- int64_t ph_pcb;
- };
+ kvaddr_t xso_so; /* kernel address of struct socket */
+ kvaddr_t so_pcb; /* kernel address of struct inpcb */
uint64_t so_oobmark;
int64_t so_spare64[8];
int32_t xso_protocol;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
