Page MenuHomeFreeBSD
Files F101824333

D47385.diff
No OneTemporary
Actions

D47385.diff
View Options

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -2179,9 +2179,8 @@
#define INP_LOOKUP_AGAIN ((struct inpcb *)(uintptr_t)-1)
static struct inpcb *
-in_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, struct in_addr faddr,
- u_short fport, struct in_addr laddr, u_short lport,
- const inp_lookup_t lockflags)
+in_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, struct in_addr laddr,
+ u_short lport, const inp_lookup_t lockflags)
{
struct inpcbhead *head;
struct inpcb *inp;
@@ -2217,8 +2216,8 @@
}
static struct inpcb *
-in_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr,
- u_short fport, struct in_addr laddr, u_short lport)
+in_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo, struct in_addr laddr,
+ u_short lport)
{
struct inpcbhead *head;
struct inpcb *inp, *local_wild, *local_exact, *jail_wild;
@@ -2319,8 +2318,8 @@
inp = in_pcblookup_lbgroup(pcbinfo, &faddr, fport,
&laddr, lport, numa_domain);
if (inp == NULL) {
- inp = in_pcblookup_hash_wild_locked(pcbinfo, faddr,
- fport, laddr, lport);
+ inp = in_pcblookup_hash_wild_locked(pcbinfo, laddr,
+ lport);
}
}
@@ -2402,8 +2401,8 @@
}
inp = INP_LOOKUP_AGAIN;
} else {
- inp = in_pcblookup_hash_wild_smr(pcbinfo, faddr, fport,
- laddr, lport, lockflags);
+ inp = in_pcblookup_hash_wild_smr(pcbinfo, laddr, lport,
+ lockflags);
}
if (inp == INP_LOOKUP_AGAIN) {
return (in_pcblookup_hash(pcbinfo, faddr, fport, laddr,
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -998,8 +998,7 @@
static struct inpcb *
in6_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo,
- const struct in6_addr *faddr, u_short fport, const struct in6_addr *laddr,
- u_short lport, const inp_lookup_t lockflags)
+ const struct in6_addr *laddr, u_short lport, const inp_lookup_t lockflags)
{
struct inpcbhead *head;
struct inpcb *inp;
@@ -1036,8 +1035,7 @@
static struct inpcb *
in6_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo,
- const struct in6_addr *faddr, u_short fport, const struct in6_addr *laddr,
- u_short lport)
+ const struct in6_addr *laddr, u_short lport)
{
struct inpcbhead *head;
struct inpcb *inp, *jail_wild, *local_exact, *local_wild;
@@ -1119,8 +1117,8 @@
inp = in6_pcblookup_lbgroup(pcbinfo, faddr, fport, laddr,
lport, numa_domain);
if (inp == NULL) {
- inp = in6_pcblookup_hash_wild_locked(pcbinfo, faddr,
- fport, laddr, lport);
+ inp = in6_pcblookup_hash_wild_locked(pcbinfo,
+ laddr, lport);
}
}
return (inp);
@@ -1196,8 +1194,8 @@
}
inp = INP_LOOKUP_AGAIN;
} else {
- inp = in6_pcblookup_hash_wild_smr(pcbinfo, faddr, fport,
- laddr, lport, lockflags);
+ inp = in6_pcblookup_hash_wild_smr(pcbinfo, laddr, lport,
+ lockflags);
}
if (inp == INP_LOOKUP_AGAIN) {
return (in6_pcblookup_hash(pcbinfo, faddr, fport, laddr,

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 5, 8:44 AM (3 h, 18 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14450416
Default Alt Text
D47385.diff (2 KB)

Event Timeline