Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Sat, 21 Mar 2020 02:34:18 +0000 (19:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Mar 2020 02:34:18 +0000 (19:34 -0700)
commit702151da6df2364342acd08898263acd51e47a6a
treec5a7a38f9b501538c87a430a9468a8143a8a0722
parentb738a185beaab8728943acdb3e67371b8a88185e
parent15ff197237e76c4dab06b7b518afaa4ebb1c43e0
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Refetch IP header pointer after pskb_may_pull() in flowtable,
   from Haishuang Yan.

2) Fix memleak in flowtable offload in nf_flow_table_free(),
   from Paul Blakey.

3) Set control.addr_type mask in flowtable offload, from Edward Cree.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>