From: wenxu <wenxu@xxxxxxxxx> This series only rebase to matser for the last patch netfilter: Support the bridge family in flow table wenxu (8): netfilter:nf_flow_table: Refactor flow_offload_tuple to destination netfilter:nf_flow_table_core: Separate inet operation to single function netfilter:nf_flow_table_ip: Separate inet operation to single function bridge: add br_vlan_get_info_rcu() netfilter:nf_flow_table_core: Support bridge family flow offload netfilter:nf_flow_table_ip: Support bridge family flow offload netfilter:nft_flow_offload: Support bridge family flow offload netfilter: Support the bridge family in flow table include/linux/if_bridge.h | 7 ++ include/net/netfilter/nf_flow_table.h | 39 +++++++- net/bridge/br_vlan.c | 25 +++++ net/bridge/netfilter/Kconfig | 8 ++ net/bridge/netfilter/Makefile | 1 + net/bridge/netfilter/nf_flow_table_bridge.c | 48 ++++++++++ net/netfilter/nf_flow_table_core.c | 102 ++++++++++++++++---- net/netfilter/nf_flow_table_ip.c | 127 +++++++++++++++++++------ net/netfilter/nft_flow_offload.c | 142 ++++++++++++++++++++++++++-- 9 files changed, 440 insertions(+), 59 deletions(-) create mode 100644 net/bridge/netfilter/nf_flow_table_bridge.c -- 1.8.3.1