diff options
| author | peter <peter@FreeBSD.org> | 2007-07-05 05:55:57 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2007-07-05 05:55:57 +0000 |
| commit | c4233cd9788ded9f8a5d05de7e76af6e4e556cd3 (patch) | |
| tree | 7e69091e0aa7d7b27e169eb4ae2ca9993d6511f7 | |
| parent | c23e287f991e95604b5d6a5113f251679a552087 (diff) | |
| download | FreeBSD-src-c4233cd9788ded9f8a5d05de7e76af6e4e556cd3.zip FreeBSD-src-c4233cd9788ded9f8a5d05de7e76af6e4e556cd3.tar.gz | |
Fix cast-qualifiers warning when INET6 is not present
Approved by: re (rwatson)
| -rw-r--r-- | sys/netinet/tcp_input.c | 3 | ||||
| -rw-r--r-- | sys/netinet/tcp_subr.c | 2 | ||||
| -rw-r--r-- | sys/netinet/tcp_var.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b09b5c4..4d5d256 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -469,8 +469,7 @@ findpcb: */ if ((tcp_log_in_vain == 1 && (thflags & TH_SYN)) || tcp_log_in_vain == 2) { - if ((s = tcp_log_addrs(NULL, th, (void *)ip, - (void *)ip6))) + if ((s = tcp_log_addrs(NULL, th, (void *)ip, ip6))) log(LOG_INFO, "%s; %s: Connection attempt " "to closed port\n", s, __func__); } diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 29ed2f1..99cdf00 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2066,7 +2066,7 @@ SYSCTL_PROC(_net_inet_tcp, TCPCTL_DROP, drop, */ char * tcp_log_addrs(struct in_conninfo *inc, struct tcphdr *th, void *ip4hdr, - void *ip6hdr) + const void *ip6hdr) { char *s, *sp; size_t size; diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index bcbc2fc..542f102 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -523,7 +523,7 @@ void tcp_fasttimo(void); void tcp_init(void); void tcp_fini(void *); char *tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *, - void *); + const void *); int tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *); void tcp_reass_init(void); void tcp_input(struct mbuf *, int); |
