diff options
author | bz <bz@FreeBSD.org> | 2008-07-10 13:23:22 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2008-07-10 13:23:22 +0000 |
commit | 4b9bb0069f0a7dd4fc5ebacc519965f51c558c9d (patch) | |
tree | af9a4ef7ced0560538ff6f05544b71f50d2a47c6 | |
parent | b35e10e860cd9d4a3a80e3cdae706928a3545cda (diff) | |
download | FreeBSD-src-4b9bb0069f0a7dd4fc5ebacc519965f51c558c9d.zip FreeBSD-src-4b9bb0069f0a7dd4fc5ebacc519965f51c558c9d.tar.gz |
For consistency take lport as u_short in in{,6}_pcblookup_local.
All callers either pass in an u_short or u_int16_t.
Reviewed by: rwatson
-rw-r--r-- | sys/netinet/in_pcb.c | 3 | ||||
-rw-r--r-- | sys/netinet/in_pcb.h | 2 | ||||
-rw-r--r-- | sys/netinet6/in6_pcb.c | 3 | ||||
-rw-r--r-- | sys/netinet6/in6_pcb.h | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 4f9b0fa..6fe60c3 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -881,7 +881,7 @@ in_pcbpurgeif0(struct inpcbinfo *pcbinfo, struct ifnet *ifp) #define INP_LOOKUP_MAPPED_PCB_COST 3 struct inpcb * in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, - u_int lport_arg, int wild_okay) + u_short lport, int wild_okay) { struct inpcb *inp; #ifdef INET6 @@ -890,7 +890,6 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, int matchwild = 3; #endif int wildcard; - u_short lport = lport_arg; INP_INFO_LOCK_ASSERT(pcbinfo); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 1e6a430..b72d1e5 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -452,7 +452,7 @@ void in_pcbfree(struct inpcb *); int in_pcbinshash(struct inpcb *); struct inpcb * in_pcblookup_local(struct inpcbinfo *, - struct in_addr, u_int, int); + struct in_addr, u_short, int); struct inpcb * in_pcblookup_hash(struct inpcbinfo *, struct in_addr, u_int, struct in_addr, u_int, int, struct ifnet *); diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 85424b4..07e5447 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -674,11 +674,10 @@ in6_pcbnotify(struct inpcbinfo *pcbinfo, struct sockaddr *dst, */ struct inpcb * in6_pcblookup_local(struct inpcbinfo *pcbinfo, struct in6_addr *laddr, - u_int lport_arg, int wild_okay) + u_short lport, int wild_okay) { register struct inpcb *inp; int matchwild = 3, wildcard; - u_short lport = lport_arg; INP_INFO_WLOCK_ASSERT(pcbinfo); diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h index 211a8f9..83551b5 100644 --- a/sys/netinet6/in6_pcb.h +++ b/sys/netinet6/in6_pcb.h @@ -80,7 +80,7 @@ int in6_pcbladdr __P((struct inpcb *, struct sockaddr *, struct in6_addr **)); struct inpcb * in6_pcblookup_local __P((struct inpcbinfo *, - struct in6_addr *, u_int, int)); + struct in6_addr *, u_short, int)); struct inpcb * in6_pcblookup_hash __P((struct inpcbinfo *, struct in6_addr *, u_int, struct in6_addr *, |