diff options
| author | David S. Miller <davem@davemloft.net> | 2021-05-14 10:47:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-14 10:47:22 -0700 |
| commit | 414ed7fe863a1822c5ddcea080c76ce0b1c6d3fd (patch) | |
| tree | 2947e47aacb34de67c1f68eecd27073cb07e722d /include | |
| parent | e4df1b0c24350a0f00229ff895a91f1072bd850d (diff) | |
| parent | f0b3d338064e1fe7531f0d2977e35f3b334abfb4 (diff) | |
| download | cachepc-linux-414ed7fe863a1822c5ddcea080c76ce0b1c6d3fd.tar.gz cachepc-linux-414ed7fe863a1822c5ddcea080c76ce0b1c6d3fd.zip | |
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) Remove the flowtable hardware refresh state, fall back to the
existing hardware pending state instead, from Roi Dayan.
2) Fix crash in pipapo avx2 lookup when FPU is in used from user
context, from Stefano Brivio.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_flow_table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h index 51d8eb99764d..48ef7460ff30 100644 --- a/include/net/netfilter/nf_flow_table.h +++ b/include/net/netfilter/nf_flow_table.h @@ -157,7 +157,6 @@ enum nf_flow_flags { NF_FLOW_HW, NF_FLOW_HW_DYING, NF_FLOW_HW_DEAD, - NF_FLOW_HW_REFRESH, NF_FLOW_HW_PENDING, }; |