OpenWrt – Blame information for rev 1
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 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 |
||
4 | nf_flow_table |
||
5 | |||
6 | Move the code that deals with device events to the core. |
||
7 | |||
8 | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> |
||
9 | --- |
||
10 | |||
11 | --- a/net/netfilter/nf_flow_table.c |
||
12 | +++ b/net/netfilter/nf_flow_table.c |
||
13 | @@ -462,5 +462,35 @@ void nf_flow_table_free(struct nf_flowta |
||
14 | } |
||
15 | EXPORT_SYMBOL_GPL(nf_flow_table_free); |
||
16 | |||
17 | +static int nf_flow_table_netdev_event(struct notifier_block *this, |
||
18 | + unsigned long event, void *ptr) |
||
19 | +{ |
||
20 | + struct net_device *dev = netdev_notifier_info_to_dev(ptr); |
||
21 | + |
||
22 | + if (event != NETDEV_DOWN) |
||
23 | + return NOTIFY_DONE; |
||
24 | + |
||
25 | + nf_flow_table_cleanup(dev_net(dev), dev); |
||
26 | + |
||
27 | + return NOTIFY_DONE; |
||
28 | +} |
||
29 | + |
||
30 | +static struct notifier_block flow_offload_netdev_notifier = { |
||
31 | + .notifier_call = nf_flow_table_netdev_event, |
||
32 | +}; |
||
33 | + |
||
34 | +static int __init nf_flow_table_module_init(void) |
||
35 | +{ |
||
36 | + return register_netdevice_notifier(&flow_offload_netdev_notifier); |
||
37 | +} |
||
38 | + |
||
39 | +static void __exit nf_flow_table_module_exit(void) |
||
40 | +{ |
||
41 | + unregister_netdevice_notifier(&flow_offload_netdev_notifier); |
||
42 | +} |
||
43 | + |
||
44 | +module_init(nf_flow_table_module_init); |
||
45 | +module_exit(nf_flow_table_module_exit); |
||
46 | + |
||
47 | MODULE_LICENSE("GPL"); |
||
48 | MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>"); |
||
49 | --- a/net/netfilter/nft_flow_offload.c |
||
50 | +++ b/net/netfilter/nft_flow_offload.c |
||
51 | @@ -194,44 +194,14 @@ static struct nft_expr_type nft_flow_off |
||
52 | .owner = THIS_MODULE, |
||
53 | }; |
||
54 | |||
55 | -static int flow_offload_netdev_event(struct notifier_block *this, |
||
56 | - unsigned long event, void *ptr) |
||
57 | -{ |
||
58 | - struct net_device *dev = netdev_notifier_info_to_dev(ptr); |
||
59 | - |
||
60 | - if (event != NETDEV_DOWN) |
||
61 | - return NOTIFY_DONE; |
||
62 | - |
||
63 | - nf_flow_table_cleanup(dev_net(dev), dev); |
||
64 | - |
||
65 | - return NOTIFY_DONE; |
||
66 | -} |
||
67 | - |
||
68 | -static struct notifier_block flow_offload_netdev_notifier = { |
||
69 | - .notifier_call = flow_offload_netdev_event, |
||
70 | -}; |
||
71 | - |
||
72 | static int __init nft_flow_offload_module_init(void) |
||
73 | { |
||
74 | - int err; |
||
75 | - |
||
76 | - register_netdevice_notifier(&flow_offload_netdev_notifier); |
||
77 | - |
||
78 | - err = nft_register_expr(&nft_flow_offload_type); |
||
79 | - if (err < 0) |
||
80 | - goto register_expr; |
||
81 | - |
||
82 | - return 0; |
||
83 | - |
||
84 | -register_expr: |
||
85 | - unregister_netdevice_notifier(&flow_offload_netdev_notifier); |
||
86 | - return err; |
||
87 | + return nft_register_expr(&nft_flow_offload_type); |
||
88 | } |
||
89 | |||
90 | static void __exit nft_flow_offload_module_exit(void) |
||
91 | { |
||
92 | nft_unregister_expr(&nft_flow_offload_type); |
||
93 | - unregister_netdevice_notifier(&flow_offload_netdev_notifier); |
||
94 | } |
||
95 | |||
96 | module_init(nft_flow_offload_module_init); |