diff options
author | rwatson <rwatson@FreeBSD.org> | 2007-05-01 16:31:02 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2007-05-01 16:31:02 +0000 |
commit | a9656f2df2346810815a1d1181ab96c2aba09a45 (patch) | |
tree | fa36278988ff46dc5b3157c907664ea78593a2c1 | |
parent | ea30d35434e5897f8168d671074c5fc1211c7961 (diff) | |
download | FreeBSD-src-a9656f2df2346810815a1d1181ab96c2aba09a45.zip FreeBSD-src-a9656f2df2346810815a1d1181ab96c2aba09a45.tar.gz |
Remove unused pcbinfo arguments to in_setsockaddr() and
in_setpeeraddr().
-rw-r--r-- | sys/netinet/in_pcb.c | 6 | ||||
-rw-r--r-- | sys/netinet/in_pcb.h | 4 | ||||
-rw-r--r-- | sys/netinet/ip_divert.c | 4 | ||||
-rw-r--r-- | sys/netinet/raw_ip.c | 4 | ||||
-rw-r--r-- | sys/netinet/tcp_usrreq.c | 4 | ||||
-rw-r--r-- | sys/netinet/udp_usrreq.c | 4 | ||||
-rw-r--r-- | sys/netinet6/in6_pcb.c | 4 |
7 files changed, 14 insertions, 16 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 0ad44f4..04bd2cf 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -796,8 +796,7 @@ in_sockaddr(in_port_t port, struct in_addr *addr_p) * because there actually /is/ a programming error somewhere... XXX) */ int -in_setsockaddr(struct socket *so, struct sockaddr **nam, - struct inpcbinfo *pcbinfo) +in_setsockaddr(struct socket *so, struct sockaddr **nam) { struct inpcb *inp; struct in_addr addr; @@ -819,8 +818,7 @@ in_setsockaddr(struct socket *so, struct sockaddr **nam, * The wrapper function will pass down the pcbinfo for this function to lock. */ int -in_setpeeraddr(struct socket *so, struct sockaddr **nam, - struct inpcbinfo *pcbinfo) +in_setpeeraddr(struct socket *so, struct sockaddr **nam) { struct inpcb *inp; struct in_addr addr; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index c2d9c2b..70a5aa1 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -391,8 +391,8 @@ void in_pcbnotifyall(struct inpcbinfo *pcbinfo, struct in_addr, int, struct inpcb *(*)(struct inpcb *, int)); void in_pcbrehash(struct inpcb *); void in_pcbsetsolabel(struct socket *so); -int in_setpeeraddr(struct socket *so, struct sockaddr **nam, struct inpcbinfo *pcbinfo); -int in_setsockaddr(struct socket *so, struct sockaddr **nam, struct inpcbinfo *pcbinfo); +int in_setpeeraddr(struct socket *so, struct sockaddr **nam); +int in_setsockaddr(struct socket *so, struct sockaddr **nam); struct sockaddr * in_sockaddr(in_port_t port, struct in_addr *addr); void in_pcbsosetlabel(struct socket *so); diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index bec12a2..b96b792 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -630,7 +630,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS) static int div_sockaddr(struct socket *so, struct sockaddr **nam) { - return (in_setsockaddr(so, nam, &divcbinfo)); + return (in_setsockaddr(so, nam)); } /* @@ -640,7 +640,7 @@ div_sockaddr(struct socket *so, struct sockaddr **nam) static int div_peeraddr(struct socket *so, struct sockaddr **nam) { - return (in_setpeeraddr(so, nam, &divcbinfo)); + return (in_setpeeraddr(so, nam)); } #ifdef SYSCTL_NODE diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 80c2d72..50ca889 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -915,7 +915,7 @@ rip_pcblist(SYSCTL_HANDLER_ARGS) static int rip_sockaddr(struct socket *so, struct sockaddr **nam) { - return (in_setsockaddr(so, nam, &ripcbinfo)); + return (in_setsockaddr(so, nam)); } /* @@ -925,7 +925,7 @@ rip_sockaddr(struct socket *so, struct sockaddr **nam) static int rip_peeraddr(struct socket *so, struct sockaddr **nam) { - return (in_setpeeraddr(so, nam, &ripcbinfo)); + return (in_setpeeraddr(so, nam)); } diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index cada87c..9a4053e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -694,7 +694,7 @@ out: static int tcp_sockaddr(struct socket *so, struct sockaddr **nam) { - return (in_setsockaddr(so, nam, &tcbinfo)); + return (in_setsockaddr(so, nam)); } /* @@ -704,7 +704,7 @@ tcp_sockaddr(struct socket *so, struct sockaddr **nam) static int tcp_peeraddr(struct socket *so, struct sockaddr **nam) { - return (in_setpeeraddr(so, nam, &tcbinfo)); + return (in_setpeeraddr(so, nam)); } /* diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index f6be5dc..92e83c8 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1139,7 +1139,7 @@ static int udp_sockaddr(struct socket *so, struct sockaddr **nam) { - return (in_setsockaddr(so, nam, &udbinfo)); + return (in_setsockaddr(so, nam)); } /* @@ -1150,7 +1150,7 @@ static int udp_peeraddr(struct socket *so, struct sockaddr **nam) { - return (in_setpeeraddr(so, nam, &udbinfo)); + return (in_setpeeraddr(so, nam)); } struct pr_usrreqs udp_usrreqs = { diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6367152..ecd7ea0 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -563,7 +563,7 @@ in6_mapped_sockaddr(struct socket *so, struct sockaddr **nam) KASSERT(inp != NULL, ("in6_mapped_sockaddr: inp == NULL")); if ((inp->inp_vflag & (INP_IPV4 | INP_IPV6)) == INP_IPV4) { - error = in_setsockaddr(so, nam, &tcbinfo); + error = in_setsockaddr(so, nam); if (error == 0) in6_sin_2_v4mapsin6_in_sock(nam); } else { @@ -584,7 +584,7 @@ in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam) KASSERT(inp != NULL, ("in6_mapped_peeraddr: inp == NULL")); if ((inp->inp_vflag & (INP_IPV4 | INP_IPV6)) == INP_IPV4) { - error = in_setpeeraddr(so, nam, &tcbinfo); + error = in_setpeeraddr(so, nam); if (error == 0) in6_sin_2_v4mapsin6_in_sock(nam); } else |