summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2015-09-04 20:28:13 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2015-09-04 20:28:13 +0000
commit0a6052e6992b5b476a4d723abfb3b28a8892fa5e (patch)
treec725016184a7dc6b16132968e16cb57c83eb744b
parentdcf9890275fe66ff30ce7fe0f862b2ac6c8099b3 (diff)
pflow_flush() still needs sc->send_nam; free it later.
-rw-r--r--sys/net/if_pflow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index 8946ea187e8..011de5e0e60 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflow.c,v 1.56 2015/09/04 08:17:06 mpi Exp $ */
+/* $OpenBSD: if_pflow.c,v 1.57 2015/09/04 20:28:12 florian Exp $ */
/*
* Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -282,7 +282,6 @@ pflow_clone_destroy(struct ifnet *ifp)
error = 0;
s = splnet();
- m_freem(sc->send_nam);
if (timeout_initialized(&sc->sc_tmo))
timeout_del(&sc->sc_tmo);
if (timeout_initialized(&sc->sc_tmo6))
@@ -290,6 +289,7 @@ pflow_clone_destroy(struct ifnet *ifp)
if (timeout_initialized(&sc->sc_tmo_tmpl))
timeout_del(&sc->sc_tmo_tmpl);
pflow_flush(sc);
+ m_freem(sc->send_nam);
if (sc->so != NULL) {
error = soclose(sc->so);
sc->so = NULL;