• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · da0caadf
    David S. Miller authored
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter updates for net-next
    
    The following patchset contains the first batch of Netfilter updates for
    your net-next tree.
    
    1) Define pr_fmt() in nf_conntrack, from Weongyo Jeong.
    
    2) Define and register netfilter's afinfo for the bridge family,
       this comes in preparation for native nfqueue's bridge for nft,
       from Stephane Bryant.
    
    3) Add new attributes to store layer 2 and VLAN headers to nfqueue,
       also from Stephane Bryant.
    
    4) Parse new NFQA_VLAN and NFQA_L2HDR nfqueue netlink attributes
       coming from userspace, from Stephane Bryant.
    
    5) Use net->ipv6.devconf_all->hop_limit instead of hardcoded hop_limit
       in IPv6 SYNPROXY, from Liping Zhang.
    
    6) Remove unnecessary check for dst == NULL in nf_reject_ipv6,
       from Haishuang Yan.
    
    7) Deinline ctnetlink event report functions, from Florian Westphal.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    da0caadf
nfnetlink_queue.c 37.5 KB