[Midnightbsd-cvs] src: pf/net: sync with freebsd 9 stable / openbsd

[laffer1 at midnightbsd.org]

Log Message:
-----------
sync with freebsd 9 stable / openbsd

Modified Files:
--------------
    src/sys/contrib/pf/net:
        if_pflog.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/if_pflog.c?r1=1.5&r2=1.6)
        if_pflog.h (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/if_pflog.h?r1=1.5&r2=1.6)
        if_pflow.h (r1.1.1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/if_pflow.h?r1=1.1.1.1&r2=1.2)
        if_pfsync.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/if_pfsync.c?r1=1.4&r2=1.5)
        if_pfsync.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/if_pfsync.h?r1=1.4&r2=1.5)
        pf.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf.c?r1=1.5&r2=1.6)
        pf_if.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_if.c?r1=1.4&r2=1.5)
        pf_ioctl.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_ioctl.c?r1=1.5&r2=1.6)
        pf_lb.c (r1.1.1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_lb.c?r1=1.1.1.1&r2=1.2)
        pf_mtag.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_mtag.h?r1=1.2&r2=1.3)
        pf_norm.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_norm.c?r1=1.6&r2=1.7)
        pf_osfp.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_osfp.c?r1=1.4&r2=1.5)
        pf_ruleset.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_ruleset.c?r1=1.4&r2=1.5)
        pf_subr.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_subr.c?r1=1.3&r2=1.4)
        pf_table.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pf_table.c?r1=1.4&r2=1.5)
        pfvar.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/net/pfvar.h?r1=1.4&r2=1.5)
    src/sys/contrib/pf/netinet:
        in4_cksum.c (r1.1.1.2 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/pf/netinet/in4_cksum.c?r1=1.1.1.2&r2=1.2)