| commit | 702151da6df2364342acd08898263acd51e47a6a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Mar 20 19:34:18 2020 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Mar 20 19:34:18 2020 -0700 |
| tree | c5a7a38f9b501538c87a430a9468a8143a8a0722 | |
| parent | b738a185beaab8728943acdb3e67371b8a88185e [diff] | |
| parent | 15ff197237e76c4dab06b7b518afaa4ebb1c43e0 [diff] |
Merge git://git.kernel.org/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>