From 994a489704d3150cd08c97a7c08376f2884b3e40 Mon Sep 17 00:00:00 2001 From: mvs Date: Fri, 12 Aug 2022 16:38:50 +0000 Subject: [PATCH] Remove unused fields from 'pflow_softc' structure. ok bluhm@ --- sys/net/if_pflow.c | 7 ++----- sys/net/if_pflow.h | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c index 5bdaccbc643..7f011073ba6 100644 --- a/sys/net/if_pflow.c +++ b/sys/net/if_pflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.c,v 1.95 2022/08/12 16:38:09 mvs Exp $ */ +/* $OpenBSD: if_pflow.c,v 1.96 2022/08/12 16:38:50 mvs Exp $ */ /* * Copyright (c) 2011 Florian Obser @@ -594,10 +594,7 @@ pflow_setmtu(struct pflow_softc *sc, int mtu_req) { int mtu; - if (sc->sc_pflow_ifp && sc->sc_pflow_ifp->if_mtu < mtu_req) - mtu = sc->sc_pflow_ifp->if_mtu; - else - mtu = mtu_req; + mtu = mtu_req; switch (sc->sc_version) { case PFLOW_PROTO_5: diff --git a/sys/net/if_pflow.h b/sys/net/if_pflow.h index 0c4b76cdf88..b495ac3a693 100644 --- a/sys/net/if_pflow.h +++ b/sys/net/if_pflow.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.h,v 1.17 2017/05/31 13:05:43 visa Exp $ */ +/* $OpenBSD: if_pflow.h,v 1.18 2022/08/12 16:38:50 mvs Exp $ */ /* * Copyright (c) 2008 Henning Brauer @@ -171,7 +171,6 @@ struct pflow_ipfix_flow6 { struct pflow_softc { struct ifnet sc_if; - struct ifnet *sc_pflow_ifp; unsigned int sc_count; unsigned int sc_count4; @@ -190,7 +189,6 @@ struct pflow_softc { struct mbuf *send_nam; struct sockaddr *sc_flowsrc; struct sockaddr *sc_flowdst; - u_char sc_send_templates; struct pflow_ipfix_tmpl sc_tmpl_ipfix; u_int8_t sc_version; struct mbuf *sc_mbuf; /* current cumulative mbuf */ -- 2.20.1