diff options
| author | avatar <avatar@FreeBSD.org> | 2008-07-22 04:23:57 +0000 |
|---|---|---|
| committer | avatar <avatar@FreeBSD.org> | 2008-07-22 04:23:57 +0000 |
| commit | d4098f774ebbce6aed8ba093eccf3f26eb13faef (patch) | |
| tree | 629fe1611bfb6969a7d1e543aca5219c8b4ad92c /sys/netinet | |
| parent | 823ce79a5bcafc8eb919f84fef6937a5636d1978 (diff) | |
| download | FreeBSD-src-d4098f774ebbce6aed8ba093eccf3f26eb13faef.zip FreeBSD-src-d4098f774ebbce6aed8ba093eccf3f26eb13faef.tar.gz | |
Trying to fix compilation bustage:
- removing 'const' qualifier from an input parameter to conform to the type
required by rw_assert();
- using in_addr->s_addr to retrive 32 bits address value.
Observed by: tinderbox
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in_pcb.c | 6 | ||||
| -rw-r--r-- | sys/netinet/in_pcb.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 93edc73..c013438 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1299,13 +1299,13 @@ inp_ip_tos_set(struct inpcb *inp, int val) } void -inp_4tuple_get(const struct inpcb *inp, uint32_t *laddr, uint16_t *lp, +inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, uint32_t *faddr, uint16_t *fp) { INP_LOCK_ASSERT(inp); - *laddr = inp->inp_laddr; - *faddr = inp->inp_faddr; + *laddr = inp->inp_laddr.s_addr; + *faddr = inp->inp_faddr.s_addr; *lp = inp->inp_lport; *fp = inp->inp_fport; } diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 02e5d2d..1f57c7f 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -358,7 +358,7 @@ struct socket * inp_inpcbtosocket(struct inpcb *inp); struct tcpcb * inp_inpcbtotcpcb(struct inpcb *inp); -void inp_4tuple_get(const struct inpcb *inp, uint32_t *laddr, uint16_t *lp, +void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, uint32_t *faddr, uint16_t *fp); #endif /* _KERNEL */ |
