From a4075636def8307ce2a78cb2a540a16f76f22e74 Mon Sep 17 00:00:00 2001
From: mikeb <mikeb@openbsd.org>
Date: Mon, 13 Apr 2015 16:45:52 +0000
Subject: [PATCH] Remove unused arguments from gettdb* functions;  OK markus,
 hshoexer, mpi

---
 sys/netinet/ip_ipsp.c |  9 ++++-----
 sys/netinet/ip_ipsp.h |  9 ++++-----
 sys/netinet/ip_spd.c  | 15 +++++++--------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index 928e8c4d45b..901fe77542f 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipsp.c,v 1.205 2015/04/10 12:31:55 dlg Exp $	*/
+/*	$OpenBSD: ip_ipsp.c,v 1.206 2015/04/13 16:45:52 mikeb Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -384,8 +384,8 @@ ipsp_aux_match(struct tdb *tdb,
 struct tdb *
 gettdbbyaddr(u_int rdomain, union sockaddr_union *dst, u_int8_t sproto,
     struct ipsec_ref *srcid, struct ipsec_ref *dstid,
-    struct ipsec_ref *local_cred, struct mbuf *m, int af,
-    struct sockaddr_encap *filter, struct sockaddr_encap *filtermask)
+    struct ipsec_ref *local_cred, struct sockaddr_encap *filter,
+    struct sockaddr_encap *filtermask)
 {
 	u_int32_t hashval;
 	struct tdb *tdbp;
@@ -417,8 +417,7 @@ gettdbbyaddr(u_int rdomain, union sockaddr_union *dst, u_int8_t sproto,
 struct tdb *
 gettdbbysrc(u_int rdomain, union sockaddr_union *src, u_int8_t sproto,
     struct ipsec_ref *srcid, struct ipsec_ref *dstid,
-    struct mbuf *m, int af, struct sockaddr_encap *filter,
-    struct sockaddr_encap *filtermask)
+    struct sockaddr_encap *filter, struct sockaddr_encap *filtermask)
 {
 	u_int32_t hashval;
 	struct tdb *tdbp;
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h
index 74ff80f4456..8550918a22f 100644
--- a/sys/netinet/ip_ipsp.h
+++ b/sys/netinet/ip_ipsp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipsp.h,v 1.161 2015/03/26 12:21:37 mikeb Exp $	*/
+/*	$OpenBSD: ip_ipsp.h,v 1.162 2015/04/13 16:45:52 mikeb Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -504,12 +504,11 @@ void	tdb_add_inp(struct tdb *, struct inpcb *, int);
 uint32_t reserve_spi(u_int, u_int32_t, u_int32_t, union sockaddr_union *,
 		union sockaddr_union *, u_int8_t, int *);
 struct	tdb *gettdb(u_int, u_int32_t, union sockaddr_union *, u_int8_t);
-struct	tdb *gettdbbyaddr(u_int, union sockaddr_union *, u_int8_t, 
+struct	tdb *gettdbbyaddr(u_int, union sockaddr_union *, u_int8_t,
 		struct ipsec_ref *, struct ipsec_ref *, struct ipsec_ref *,
-		struct mbuf *, int, struct sockaddr_encap *,
-		struct sockaddr_encap *);
+		struct sockaddr_encap *, struct sockaddr_encap *);
 struct	tdb *gettdbbysrc(u_int, union sockaddr_union *, u_int8_t,
-		struct ipsec_ref *, struct ipsec_ref *, struct mbuf *, int,
+		struct ipsec_ref *, struct ipsec_ref *,
 		struct sockaddr_encap *, struct sockaddr_encap *);
 struct	tdb *gettdbbysrcdst(u_int, u_int32_t, union sockaddr_union *,
 		union sockaddr_union *, u_int8_t);
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 68a08c5e311..0170dc1d85c 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.78 2015/03/14 03:38:52 jsg Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.79 2015/04/13 16:45:52 mikeb Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -405,8 +405,8 @@ ipsp_spd_lookup(struct mbuf *m, int af, int hlen, int *error, int direction,
 				ipo->ipo_sproto,
 				srcid ? srcid : ipo->ipo_srcid,
 				dstid ? dstid : ipo->ipo_dstid,
-				ipo->ipo_local_cred, m, af,
-				&ipo->ipo_addr, &ipo->ipo_mask);
+				ipo->ipo_local_cred, &ipo->ipo_addr,
+				&ipo->ipo_mask);
 			if (ipo->ipo_tdb) {
 				TAILQ_INSERT_TAIL(&ipo->ipo_tdb->tdb_policy_head,
 				    ipo, ipo_tdb_next);
@@ -519,7 +519,7 @@ ipsp_spd_lookup(struct mbuf *m, int af, int hlen, int *error, int direction,
 			    gettdbbysrc(rdomain,
 				dignore ? &ssrc : &ipo->ipo_dst,
 				ipo->ipo_sproto, ipo->ipo_srcid,
-				ipo->ipo_dstid, m, af, &ipo->ipo_addr,
+				ipo->ipo_dstid, &ipo->ipo_addr,
 				&ipo->ipo_mask);
 			if (ipo->ipo_tdb)
 				TAILQ_INSERT_TAIL(&ipo->ipo_tdb->tdb_policy_head,
@@ -1010,7 +1010,7 @@ ipsp_spd_inp(struct mbuf *m, int af, int hlen, int *error, int direction,
 				    &inp->inp_ipo->ipo_dst,
 				    inp->inp_ipo->ipo_sproto,
 				    inp->inp_ipo->ipo_srcid,
-				    inp->inp_ipo->ipo_dstid, m, af,
+				    inp->inp_ipo->ipo_dstid,
 				    &inp->inp_ipo->ipo_addr,
 				    &inp->inp_ipo->ipo_mask) != NULL) {
 					*error = -EINVAL;
@@ -1068,7 +1068,7 @@ ipsp_spd_inp(struct mbuf *m, int af, int hlen, int *error, int direction,
 				    inp->inp_ipo->ipo_sproto,
 				    inp->inp_ipo->ipo_srcid,
 				    inp->inp_ipo->ipo_dstid,
-				    inp->inp_ipo->ipo_local_cred, m, af,
+				    inp->inp_ipo->ipo_local_cred,
 				    &inp->inp_ipo->ipo_addr,
 				    &inp->inp_ipo->ipo_mask);
 			}
@@ -1082,8 +1082,7 @@ ipsp_spd_inp(struct mbuf *m, int af, int hlen, int *error, int direction,
 
 			tdb = gettdbbyaddr(rtable_l2(inp->inp_rtableid),
 			    &sipon.ipo_dst, IPPROTO_ESP, NULL,
-			    NULL, NULL, m, af, &sipon.ipo_addr,
-			    &sipon.ipo_mask);
+			    NULL, NULL, &sipon.ipo_addr, &sipon.ipo_mask);
 		}
 
 		/* If we found an appropriate SA... */
-- 
2.20.1