From 407687c9707535765ebcd13a5d0c65c76fddfeb5 Mon Sep 17 00:00:00 2001
From: dlg <dlg@openbsd.org>
Date: Thu, 8 Oct 2015 11:36:51 +0000
Subject: [PATCH] use the state id to set a flowid on an mbuf.

ok mpi@ mikeb@ sthen@
---
 sys/net/pf.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys/net/pf.c b/sys/net/pf.c
index 50dd87e6e13..bc5cc6a9c34 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.945 2015/09/23 08:49:46 mpi Exp $ */
+/*	$OpenBSD: pf.c,v 1.946 2015/10/08 11:36:51 dlg Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -6537,6 +6537,11 @@ done:
 		s->key[PF_SK_STACK]->inp = pd.m->m_pkthdr.pf.inp;
 	}
 
+	if (s) {
+		pd.m->m_pkthdr.flowid = M_FLOWID_VALID |
+		    (M_FLOWID_MASK & bemtoh64(&s->id));
+	}
+
 	/*
 	 * connections redirected to loopback should not match sockets
 	 * bound specifically to loopback due to security implications,
-- 
2.20.1