1 From: Pablo Neira Ayuso <pablo@netfilter.org>
2 Date: Thu, 25 Jan 2018 12:58:55 +0100
3 Subject: [PATCH] netfilter: nft_flow_offload: handle netdevice events from
6 Move the code that deals with device events to the core.
8 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
11 --- a/net/netfilter/nf_flow_table_core.c
12 +++ b/net/netfilter/nf_flow_table_core.c
13 @@ -576,13 +576,41 @@ void nf_flow_table_free(struct nf_flowta
15 EXPORT_SYMBOL_GPL(nf_flow_table_free);
17 +static int nf_flow_table_netdev_event(struct notifier_block *this,
18 + unsigned long event, void *ptr)
20 + struct net_device *dev = netdev_notifier_info_to_dev(ptr);
22 + if (event != NETDEV_DOWN)
25 + nf_flow_table_cleanup(dev);
30 +static struct notifier_block flow_offload_netdev_notifier = {
31 + .notifier_call = nf_flow_table_netdev_event,
34 static int __init nf_flow_table_module_init(void)
36 - return nf_flow_table_offload_init();
39 + ret = nf_flow_table_offload_init();
43 + ret = register_netdevice_notifier(&flow_offload_netdev_notifier);
45 + nf_flow_table_offload_exit();
50 static void __exit nf_flow_table_module_exit(void)
52 + unregister_netdevice_notifier(&flow_offload_netdev_notifier);
53 nf_flow_table_offload_exit();
56 --- a/net/netfilter/nft_flow_offload.c
57 +++ b/net/netfilter/nft_flow_offload.c
58 @@ -237,47 +237,14 @@ static struct nft_expr_type nft_flow_off
62 -static int flow_offload_netdev_event(struct notifier_block *this,
63 - unsigned long event, void *ptr)
65 - struct net_device *dev = netdev_notifier_info_to_dev(ptr);
67 - if (event != NETDEV_DOWN)
70 - nf_flow_table_cleanup(dev);
75 -static struct notifier_block flow_offload_netdev_notifier = {
76 - .notifier_call = flow_offload_netdev_event,
79 static int __init nft_flow_offload_module_init(void)
83 - err = register_netdevice_notifier(&flow_offload_netdev_notifier);
87 - err = nft_register_expr(&nft_flow_offload_type);
94 - unregister_netdevice_notifier(&flow_offload_netdev_notifier);
97 + return nft_register_expr(&nft_flow_offload_type);
100 static void __exit nft_flow_offload_module_exit(void)
102 nft_unregister_expr(&nft_flow_offload_type);
103 - unregister_netdevice_notifier(&flow_offload_netdev_notifier);
106 module_init(nft_flow_offload_module_init);