Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b06e8ae authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: remove cops->tcf_cl_offload 



cops->tcf_cl_offload is no longer needed, as the drivers check what they
can and cannot offload using the classid identify helpers. So remove this.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 237f79d2

include/net/pkt_cls.h

+3 −11
Original line number Diff line number Diff line
@@ -457,19 +457,12 @@ struct tc_cls_u32_offload { 
	};

};



static inline bool tc_can_offload(const struct net_device *dev,

				  const struct tcf_proto *tp)

static inline bool tc_can_offload(const struct net_device *dev)

{

	const struct Qdisc *sch = tp->q;

	const struct Qdisc_class_ops *cops = sch->ops->cl_ops;



	if (!(dev->features & NETIF_F_HW_TC))

		return false;

	if (!dev->netdev_ops->ndo_setup_tc)

		return false;

	if (cops && cops->tcf_cl_offload)

		return cops->tcf_cl_offload(tp->classid);



	return true;

}
@@ -478,12 +471,11 @@ static inline bool tc_skip_hw(u32 flags) 
	return (flags & TCA_CLS_FLAGS_SKIP_HW) ? true : false;

}



static inline bool tc_should_offload(const struct net_device *dev,

				     const struct tcf_proto *tp, u32 flags)

static inline bool tc_should_offload(const struct net_device *dev, u32 flags)

{

	if (tc_skip_hw(flags))

		return false;

	return tc_can_offload(dev, tp);

	return tc_can_offload(dev);

}



static inline bool tc_skip_sw(u32 flags)

include/net/sch_generic.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ struct Qdisc_class_ops { 


	/* Filter manipulation */

	struct tcf_block *	(*tcf_block)(struct Qdisc *, unsigned long);

	bool			(*tcf_cl_offload)(u32 classid);

	unsigned long		(*bind_tcf)(struct Qdisc *, unsigned long,

					u32 classid);

	void			(*unbind_tcf)(struct Qdisc *, unsigned long);

net/sched/cls_bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int cls_bpf_offload(struct tcf_proto *tp, struct cls_bpf_prog *prog, 
		(oldprog && tc_skip_sw(oldprog->gen_flags));



	if (oldprog && oldprog->offloaded) {

		if (tc_should_offload(dev, tp, prog->gen_flags)) {

		if (tc_should_offload(dev, prog->gen_flags)) {

			cmd = TC_CLSBPF_REPLACE;

		} else if (!tc_skip_sw(prog->gen_flags)) {

			obj = oldprog;
@@ -187,7 +187,7 @@ static int cls_bpf_offload(struct tcf_proto *tp, struct cls_bpf_prog *prog, 
			return -EINVAL;

		}

	} else {

		if (!tc_should_offload(dev, tp, prog->gen_flags))

		if (!tc_should_offload(dev, prog->gen_flags))

			return skip_sw ? -EINVAL : 0;

		cmd = TC_CLSBPF_ADD;

	}

net/sched/cls_flower.c

+4 −4
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f) 
	struct tc_cls_flower_offload cls_flower = {};

	struct net_device *dev = f->hw_dev;



	if (!tc_can_offload(dev, tp))

	if (!tc_can_offload(dev))

		return;



	tc_cls_common_offload_init(&cls_flower.common, tp);
@@ -246,9 +246,9 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, 
	struct tc_cls_flower_offload cls_flower = {};

	int err;



	if (!tc_can_offload(dev, tp)) {

	if (!tc_can_offload(dev)) {

		if (tcf_exts_get_dev(dev, &f->exts, &f->hw_dev) ||

		    (f->hw_dev && !tc_can_offload(f->hw_dev, tp))) {

		    (f->hw_dev && !tc_can_offload(f->hw_dev))) {

			f->hw_dev = dev;

			return tc_skip_sw(f->flags) ? -EINVAL : 0;

		}
@@ -281,7 +281,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f) 
	struct tc_cls_flower_offload cls_flower = {};

	struct net_device *dev = f->hw_dev;



	if (!tc_can_offload(dev, tp))

	if (!tc_can_offload(dev))

		return;



	tc_cls_common_offload_init(&cls_flower.common, tp);

net/sched/cls_matchall.c

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void mall_destroy(struct tcf_proto *tp) 
	if (!head)

		return;



	if (tc_should_offload(dev, tp, head->flags))

	if (tc_should_offload(dev, head->flags))

		mall_destroy_hw_filter(tp, head, (unsigned long) head);



	call_rcu(&head->rcu, mall_destroy_rcu);
@@ -172,7 +172,7 @@ static int mall_change(struct net *net, struct sk_buff *in_skb, 
	if (err)

		goto err_set_parms;



	if (tc_should_offload(dev, tp, flags)) {

	if (tc_should_offload(dev, flags)) {

		err = mall_replace_hw_filter(tp, new, (unsigned long) new);

		if (err) {

			if (tc_skip_sw(flags))