From 75dd118247ef02f7810df72ed242d7ff7e5f6434 Mon Sep 17 00:00:00 2001 From: Ryan Libby Date: Fri, 11 Dec 2020 22:52:03 +0000 Subject: [PATCH] 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 --- sys/dev/if_wg/include/sys/if_wg_session_vars.h | 3 --- sys/dev/if_wg/include/sys/wg_module.h | 2 -- sys/dev/if_wg/module/if_wg_session.c | 4 ---- sys/modules/if_wg/Makefile | 1 - 4 files changed, 10 deletions(-) diff --git a/sys/dev/if_wg/include/sys/if_wg_session_vars.h b/sys/dev/if_wg/include/sys/if_wg_session_vars.h index e9261c07945..5fd85d3b716 100644 --- a/sys/dev/if_wg/include/sys/if_wg_session_vars.h +++ b/sys/dev/if_wg/include/sys/if_wg_session_vars.h @@ -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); diff --git a/sys/dev/if_wg/include/sys/wg_module.h b/sys/dev/if_wg/include/sys/wg_module.h index a0b6f13b7e9..cc662104d64 100644 --- a/sys/dev/if_wg/include/sys/wg_module.h +++ b/sys/dev/if_wg/include/sys/wg_module.h @@ -47,8 +47,6 @@ #include #include -MALLOC_DECLARE(M_WG); - enum noise_lengths { NOISE_PUBLIC_KEY_LEN = CURVE25519_KEY_SIZE, diff --git a/sys/dev/if_wg/module/if_wg_session.c b/sys/dev/if_wg/module/if_wg_session.c index 3b1589884cd..54e63d05384 100644 --- a/sys/dev/if_wg/module/if_wg_session.c +++ b/sys/dev/if_wg/module/if_wg_session.c @@ -113,7 +113,6 @@ SYSCTL_INT(_net_wg, OID_AUTO, debug, CTLFLAG_RWTUN, &wireguard_debug, 0, #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 *); @@ -146,9 +145,6 @@ static void wg_timers_disable(struct wg_timers *); 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 */ static int wg_cookie_validate_packet(struct cookie_checker *, struct mbuf *, diff --git a/sys/modules/if_wg/Makefile b/sys/modules/if_wg/Makefile index d57903c4213..c6061957a74 100644 --- a/sys/modules/if_wg/Makefile +++ b/sys/modules/if_wg/Makefile @@ -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