svn commit: r368566 - in head/sys: dev/if_wg/include/sys dev/if_wg/module modules/if_wg

[Ryan Libby]

Author: rlibby
Date: Fri Dec 11 22:52:03 2020
New Revision: 368566
URL: https://svnweb.freebsd.org/changeset/base/368566

Log:
  if_wg: appease gcc
  
   - remove -ferror-limit option
   - quiet -Wredundant-decls
  
  Reviewed by:	mmacy
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D27559

Modified:
  head/sys/dev/if_wg/include/sys/if_wg_session_vars.h
  head/sys/dev/if_wg/include/sys/wg_module.h
  head/sys/dev/if_wg/module/if_wg_session.c
  head/sys/modules/if_wg/Makefile

Modified: head/sys/dev/if_wg/include/sys/if_wg_session_vars.h
==============================================================================
--- head/sys/dev/if_wg/include/sys/if_wg_session_vars.h	Fri Dec 11 22:51:57 2020	(r368565)
+++ head/sys/dev/if_wg/include/sys/if_wg_session_vars.h	Fri Dec 11 22:52:03 2020	(r368566)
@@ -274,9 +274,6 @@ struct wg_tag {
 	int		t_mtu;
 };
 
-int wg_route_add(struct wg_route_table *tbl, struct wg_peer *peer,
-    const struct wg_allowedip *cidr_);
-
 struct wg_peer *wg_route_lookup(struct wg_route_table *, struct mbuf *,
     enum route_direction);
 

Modified: head/sys/dev/if_wg/include/sys/wg_module.h
==============================================================================
--- head/sys/dev/if_wg/include/sys/wg_module.h	Fri Dec 11 22:51:57 2020	(r368565)
+++ head/sys/dev/if_wg/include/sys/wg_module.h	Fri Dec 11 22:52:03 2020	(r368566)
@@ -47,8 +47,6 @@
 #include <zinc/chacha20poly1305.h>
 #include <crypto/blake2s.h>
 
-MALLOC_DECLARE(M_WG);
-
 
 enum noise_lengths {
 	NOISE_PUBLIC_KEY_LEN = CURVE25519_KEY_SIZE,

Modified: head/sys/dev/if_wg/module/if_wg_session.c
==============================================================================
--- head/sys/dev/if_wg/module/if_wg_session.c	Fri Dec 11 22:51:57 2020	(r368565)
+++ head/sys/dev/if_wg/module/if_wg_session.c	Fri Dec 11 22:52:03 2020	(r368566)
@@ -113,7 +113,6 @@ SYSCTL_INT(_net_wg, OID_AUTO, debug, CTLFLAG_RWTUN, &w
 #define DPRINTF(sc,  ...) if (wireguard_debug) if_printf(sc->sc_ifp, ##__VA_ARGS__)
 
 /* Socket */
-int	wg_socket_close(struct wg_socket *);
 static int	wg_socket_bind(struct wg_softc *sc, struct wg_socket *);
 static int	wg_send(struct wg_softc *, struct wg_endpoint *, struct mbuf *);
 
@@ -145,9 +144,6 @@ static void	wg_timers_disable(struct wg_timers *);
 /* Queue */
 static int	wg_queue_in(struct wg_peer *, struct mbuf *);
 static struct mbuf *wg_queue_dequeue(struct wg_queue *, struct wg_tag **);
-
-/* Route */
-void	wg_route_destroy(struct wg_route_table *);
 
 /* Cookie */
 

Modified: head/sys/modules/if_wg/Makefile
==============================================================================
--- head/sys/modules/if_wg/Makefile	Fri Dec 11 22:51:57 2020	(r368565)
+++ head/sys/modules/if_wg/Makefile	Fri Dec 11 22:52:03 2020	(r368566)
@@ -14,7 +14,6 @@ ZINCDIR= ${SRCTOP}/sys/dev/if_wg/module/crypto/zinc
 CFLAGS+= -I${INCDIR}
 
 CFLAGS+= -D__KERNEL__
-CFLAGS+= -ferror-limit=7
 
 DEBUG_FLAGS=-g