pf: Add patch from rev 1.554

    RSTs sent due to "block return(-rst)" could be routed using
    the main routing table instead of an alternate one specified
    on the block rule.

diff --git a/sys/config/LINT b/sys/config/LINT
index fe244b7..a3c59f7 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -1461,7 +1461,7 @@ options           ATH_DIAGAPI     # diagnostic interface to the HAL
 options                ATH_RXBUF=80    # number of RX buffers to allocate
 options                ATH_TXBUF=400   # number of TX buffers to allocate
 #device                iwl             # Intel PRO/Wireless 2100
-device         iwi             # Intel PRO/Wireless 2200BG/2915ABG
+#device                iwi             # Intel PRO/Wireless 2200BG/2915ABG
 device         iwn             # Intel WiFi Link 4965/1000/5000/5150/5300/6000/6050
 device         wi              # WaveLAN/IEEE, PRISM-II, Spectrum24 802.11DS
 #device                rtw             # RealTek 8180

diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c
index 5b34310..f18bde6 100644 (file)
--- a/sys/net/pf/pf.c
+++ b/sys/net/pf/pf.c
@@ -1652,7 +1652,7 @@ pf_send_tcp(const struct pf_rule *r, sa_family_t af,
        m->m_pkthdr.pf.tag = rtag;
 
        if (r != NULL && r->rtableid >= 0)
-               m->m_pkthdr.pf.rtableid = m->m_pkthdr.pf.rtableid;
+               m->m_pkthdr.pf.rtableid = r->rtableid;
 
 #ifdef ALTQ
        if (r != NULL && r->qid) {