svn commit: r193550 - head/sys/netinet

[Pawel Jakub Dawidek]

Author: pjd
Date: Fri Jun  5 23:53:17 2009
New Revision: 193550
URL: http://svn.freebsd.org/changeset/base/193550

Log:
  Only four out of nine arguments for ip_ipsec_output() are actually used.
  Kill unused arguments except for 'ifp' as it might be used in the future
  for detecting IPsec-capable interfaces.

Modified:
  head/sys/netinet/ip_ipsec.c
  head/sys/netinet/ip_ipsec.h
  head/sys/netinet/ip_output.c

Modified: head/sys/netinet/ip_ipsec.c
==============================================================================
--- head/sys/netinet/ip_ipsec.c	Fri Jun  5 23:37:57 2009	(r193549)
+++ head/sys/netinet/ip_ipsec.c	Fri Jun  5 23:53:17 2009	(r193550)
@@ -256,8 +256,7 @@ ip_ipsec_mtu(struct mbuf *m, int mtu)
  */
 int
 ip_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error,
-    struct route **ro, struct route *iproute, struct sockaddr_in **dst,
-    struct in_ifaddr **ia, struct ifnet **ifp)
+    struct ifnet **ifp)
 {
 #ifdef IPSEC
 	struct secpolicy *sp = NULL;

Modified: head/sys/netinet/ip_ipsec.h
==============================================================================
--- head/sys/netinet/ip_ipsec.h	Fri Jun  5 23:37:57 2009	(r193549)
+++ head/sys/netinet/ip_ipsec.h	Fri Jun  5 23:53:17 2009	(r193550)
@@ -37,6 +37,5 @@ int	ip_ipsec_fwd(struct mbuf *);
 int	ip_ipsec_input(struct mbuf *);
 int	ip_ipsec_mtu(struct mbuf *, int);
 int	ip_ipsec_output(struct mbuf **, struct inpcb *, int *, int *,
-		struct route **, struct route *, struct sockaddr_in **,
-		struct in_ifaddr **, struct ifnet **);
+	    struct ifnet **);
 #endif

Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c	Fri Jun  5 23:37:57 2009	(r193549)
+++ head/sys/netinet/ip_output.c	Fri Jun  5 23:53:17 2009	(r193550)
@@ -467,7 +467,7 @@ again:
 
 sendit:
 #ifdef IPSEC
-	switch(ip_ipsec_output(&m, inp, &flags, &error, &ro, &iproute, &dst, &ia, &ifp)) {
+	switch(ip_ipsec_output(&m, inp, &flags, &error, &ifp)) {
 	case 1:
 		goto bad;
 	case -1: