OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 234... Line 234...
234 .free = nf_flow_table_free, 234 .free = nf_flow_table_free,
235 .hook = nf_flow_offload_inet_hook, 235 .hook = nf_flow_offload_inet_hook,
236 .owner = THIS_MODULE, 236 .owner = THIS_MODULE,
237 --- a/net/netfilter/nf_tables_api.c 237 --- a/net/netfilter/nf_tables_api.c
238 +++ b/net/netfilter/nf_tables_api.c 238 +++ b/net/netfilter/nf_tables_api.c
239 @@ -5075,40 +5075,38 @@ static int nf_tables_newflowtable(struct 239 @@ -5064,40 +5064,38 @@ static int nf_tables_newflowtable(struct
240 } 240 }
Line 241... Line 241...
241 241
242 flowtable->data.type = type; 242 flowtable->data.type = type;
243 - err = rhashtable_init(&flowtable->data.rhashtable, type->params); 243 - err = rhashtable_init(&flowtable->data.rhashtable, type->params);
Line 283... Line 283...
283 +err4: 283 +err4:
284 + flowtable->data.type->free(&flowtable->data); 284 + flowtable->data.type->free(&flowtable->data);
285 err3: 285 err3:
286 module_put(type->owner); 286 module_put(type->owner);
287 err2: 287 err2:
288 @@ -5389,10 +5387,8 @@ err: 288 @@ -5378,10 +5376,8 @@ err:
Line 289... Line 289...
289 289
290 static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable) 290 static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable)
291 { 291 {
292 - cancel_delayed_work_sync(&flowtable->data.gc_work); 292 - cancel_delayed_work_sync(&flowtable->data.gc_work);