net/sched: act_mirred: refactor the handle of xmit (fa6d6399) · Commits · 戴 / test

include/net/sch_generic.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -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

+15 −6

Original line number	Diff line number	Diff line
		@@ -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);