net/sched: cls_flower: merge filter delete/destroy common code

Move common code from fl_delete and fl_detroy to __fl_delete.

Signed-off-by: Roi Dayan <roid@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index a5f637011f9f6101043ccb5373b8e7152a52ae1e..a8fb1ca03b3ea513a2822621db1e03aff92695b6 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -269,6 +269,14 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
        dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, &tc);
 }
 
+static void __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f)
+{
+       list_del_rcu(&f->list);
+       fl_hw_destroy_filter(tp, (unsigned long)f);
+       tcf_unbind_filter(tp, &f->res);
+       call_rcu(&f->rcu, fl_destroy_filter);
+}
+
 static bool fl_destroy(struct tcf_proto *tp, bool force)
 {
        struct cls_fl_head *head = rtnl_dereference(tp->root);
@@ -277,12 +285,8 @@ static bool fl_destroy(struct tcf_proto *tp, bool force)
        if (!force && !list_empty(&head->filters))
                return false;
 
-       list_for_each_entry_safe(f, next, &head->filters, list) {
-               fl_hw_destroy_filter(tp, (unsigned long)f);
-               list_del_rcu(&f->list);
-               tcf_unbind_filter(tp, &f->res);
-               call_rcu(&f->rcu, fl_destroy_filter);
-       }
+       list_for_each_entry_safe(f, next, &head->filters, list)
+               __fl_delete(tp, f);
        RCU_INIT_POINTER(tp->root, NULL);
        if (head->mask_assigned)
                rhashtable_destroy(&head->ht);
@@ -742,10 +746,7 @@ static int fl_delete(struct tcf_proto *tp, unsigned long arg)
 
        rhashtable_remove_fast(&head->ht, &f->ht_node,
                               head->ht_params);
-       list_del_rcu(&f->list);
-       fl_hw_destroy_filter(tp, (unsigned long)f);
-       tcf_unbind_filter(tp, &f->res);
-       call_rcu(&f->rcu, fl_destroy_filter);
+       __fl_delete(tp, f);
        return 0;
 }