Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: flowtable: remove redundant field in flow_offload_work struct

Already available through the flowtable object, remove it.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

+6 -5
+6 -5
net/netfilter/nf_flow_table_offload.c
··· 20 20 struct flow_offload_work { 21 21 struct list_head list; 22 22 enum flow_cls_command cmd; 23 - int priority; 24 23 struct nf_flowtable *flowtable; 25 24 struct flow_offload *flow; 26 25 struct work_struct work; ··· 873 874 enum flow_offload_tuple_dir dir) 874 875 { 875 876 return nf_flow_offload_tuple(offload->flowtable, offload->flow, 876 - flow_rule, dir, offload->priority, 877 + flow_rule, dir, 878 + offload->flowtable->priority, 877 879 FLOW_CLS_REPLACE, NULL, 878 880 &offload->flowtable->flow_block.cb_list); 879 881 } ··· 883 883 enum flow_offload_tuple_dir dir) 884 884 { 885 885 nf_flow_offload_tuple(offload->flowtable, offload->flow, NULL, dir, 886 - offload->priority, FLOW_CLS_DESTROY, NULL, 886 + offload->flowtable->priority, 887 + FLOW_CLS_DESTROY, NULL, 887 888 &offload->flowtable->flow_block.cb_list); 888 889 } 889 890 ··· 935 934 struct flow_stats *stats) 936 935 { 937 936 nf_flow_offload_tuple(offload->flowtable, offload->flow, NULL, dir, 938 - offload->priority, FLOW_CLS_STATS, stats, 937 + offload->flowtable->priority, 938 + FLOW_CLS_STATS, stats, 939 939 &offload->flowtable->flow_block.cb_list); 940 940 } 941 941 ··· 1014 1012 1015 1013 offload->cmd = cmd; 1016 1014 offload->flow = flow; 1017 - offload->priority = flowtable->priority; 1018 1015 offload->flowtable = flowtable; 1019 1016 INIT_WORK(&offload->work, flow_offload_work_handler); 1020 1017