[src/trunk]: src/sys/netinet Remove unused argument from udp4_espinudp, and r...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7e849d53626
branches:  trunk
changeset: 322374:f7e849d53626
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue May 01 08:42:41 2018 +0000

description:
Remove unused argument from udp4_espinudp, and remove unused includes.

diffstat:

 sys/netinet/udp_usrreq.c |  18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diffs (67 lines):

diff -r dc51c84e5813 -r f7e849d53626 sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c  Tue May 01 08:34:08 2018 +0000
+++ b/sys/netinet/udp_usrreq.c  Tue May 01 08:42:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp_usrreq.c,v 1.249 2018/04/28 13:26:57 maxv Exp $    */
+/*     $NetBSD: udp_usrreq.c,v 1.250 2018/05/01 08:42:41 maxv Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.249 2018/04/28 13:26:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.250 2018/05/01 08:42:41 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -103,7 +103,6 @@
 
 #ifdef INET6
 #include <netinet/ip6.h>
-#include <netinet/icmp6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/ip6_private.h>
 #include <netinet6/in6_pcb.h>
@@ -119,9 +118,6 @@
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/esp.h>
-#ifdef INET6
-#include <netipsec/ipsec6.h>
-#endif
 #endif
 
 #ifdef IPKDB
@@ -137,8 +133,7 @@
 
 #ifdef INET
 #ifdef IPSEC
-static int udp4_espinudp(struct mbuf **, int, struct sockaddr *,
-    struct socket *);
+static int udp4_espinudp(struct mbuf **, int, struct socket *);
 #endif
 static void udp4_sendup(struct mbuf *, int, struct sockaddr *,
     struct socket *);
@@ -605,9 +600,7 @@
 #ifdef IPSEC
                /* Handle ESP over UDP */
                if (inp->inp_flags & INP_ESPINUDP_ALL) {
-                       struct sockaddr *sa = (struct sockaddr *)src;
-
-                       switch (udp4_espinudp(mp, off, sa, inp->inp_socket)) {
+                       switch (udp4_espinudp(mp, off, inp->inp_socket)) {
                        case -1: /* Error, m was freed */
                                rcvcnt = -1;
                                goto bad;
@@ -1252,8 +1245,7 @@
  *    -1 if an error occurred and m was freed
  */
 static int
-udp4_espinudp(struct mbuf **mp, int off, struct sockaddr *src,
-    struct socket *so)
+udp4_espinudp(struct mbuf **mp, int off, struct socket *so)
 {
        size_t len;
        void *data;