d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that after r335979 the kernel addresses in API structures are

Browse Source 
fixed size, there is no reason left for the unions.

Discussed with:	brooks
This commit is contained in:
Gleb Smirnoff 2018-08-04 00:03:21 +00:00
parent 86b4ad7dd5
commit cc7963191d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=337279
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/netinet/in_pcb.h
View File

@ -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) */

10
sys/sys/socketvar.h
View File

@ -475,14 +475,8 @@ int accept_filt_generic_mod_event(module_t mod, int event, void *data);
*/
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;