diff options
author | Christiano F. Haesbaert <haesbaert@cvs.openbsd.org> | 2013-11-15 21:34:52 +0000 |
---|---|---|
committer | Christiano F. Haesbaert <haesbaert@cvs.openbsd.org> | 2013-11-15 21:34:52 +0000 |
commit | e332f1d5b7c143764fdd2738ee9abc9ece8d627a (patch) | |
tree | 2cd08fc6400eaa3d84e6be73fc99201823a54ad9 /sys/net/pf.c | |
parent | 90815fb73db6d9c25a8efae30ea861c54f069b41 (diff) |
Revert 1.858, as it causes panics of inp:
kernel diagnostic assertion \"sotoinpcb(inp->inp_socket) == inp\"
failed: file "../../../../netinet/tcp_input.c", line 646
Will think of a better fix.
Diffstat (limited to 'sys/net/pf.c')
-rw-r--r-- | sys/net/pf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 63683e92cda..7967a6124b2 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.859 2013/11/15 16:15:41 bluhm Exp $ */ +/* $OpenBSD: pf.c,v 1.860 2013/11/15 21:34:51 haesbaert Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -6806,8 +6806,4 @@ void pf_pkt_addr_changed(struct mbuf *m) { m->m_pkthdr.pf.statekey = NULL; - if (m->m_pkthdr.pf.inp) { - m->m_pkthdr.pf.inp->inp_pf_sk = NULL; - m->m_pkthdr.pf.inp = NULL; - } } |