net/sched: act_mirred: refactor the handle of xmit

This one is prepare for the next patch.

Signed-off-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index d8fd8676fc724110630904909f64d7789f3a4b47..dd74f06bbb0b42505860c77d97fd577c0bc12c52 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -1281,9 +1281,4 @@ void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc,
 void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,
                                struct tcf_block *block);
 
-static inline int skb_tc_reinsert(struct sk_buff *skb, struct tcf_result *res)
-{
-       return res->ingress ? netif_receive_skb(skb) : dev_queue_xmit(skb);
-}
-
 #endif

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index e24b7e2331cdd24e0d6e1b70bde274767165927f..17d00958047e9bc8f210e7f44b1ce3ba28b9342b 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -205,6 +205,18 @@ release_idr:
        return err;
 }
 
+static int tcf_mirred_forward(bool want_ingress, struct sk_buff *skb)
+{
+       int err;
+
+       if (!want_ingress)
+               err = dev_queue_xmit(skb);
+       else
+               err = netif_receive_skb(skb);
+
+       return err;
+}
+
 static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
                          struct tcf_result *res)
 {
@@ -287,18 +299,15 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
                /* let's the caller reinsert the packet, if possible */
                if (use_reinsert) {
                        res->ingress = want_ingress;
-                       if (skb_tc_reinsert(skb, res))
+                       err = tcf_mirred_forward(res->ingress, skb);
+                       if (err)
                                tcf_action_inc_overlimit_qstats(&m->common);
                        __this_cpu_dec(mirred_rec_level);
                        return TC_ACT_CONSUMED;
                }
        }
 
-       if (!want_ingress)
-               err = dev_queue_xmit(skb2);
-       else
-               err = netif_receive_skb(skb2);
-
+       err = tcf_mirred_forward(want_ingress, skb2);
        if (err) {
 out:
                tcf_action_inc_overlimit_qstats(&m->common);