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

Commit a436d20d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cls_u32-hwoffload-fixes' 



Jakub Kicinski says:

====================
incremental cls_u32 hardware offload fixes

These are incremental changes from v1 of cls_u32 fixes.
First patch is reposted in its entirety, patch 2 is an
incremental change from patch 2 of the original series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3497ed8c 201c44bd

net/sched/cls_u32.c

+26 −19
Original line number Diff line number Diff line
@@ -508,7 +508,9 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, 
	offload.type = TC_SETUP_CLSU32;

	offload.cls_u32 = &u32_offload;



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

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

		return tc_skip_sw(flags) ? -EINVAL : 0;



	offload.cls_u32->command = TC_CLSU32_REPLACE_KNODE;

	offload.cls_u32->knode.handle = n->handle;

	offload.cls_u32->knode.fshift = n->fshift;
@@ -528,7 +530,6 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, 
					    tp->protocol, &offload);

	if (tc_skip_sw(flags))

		return err;

	}



	return 0;

}
@@ -922,11 +923,17 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, 
		ht->divisor = divisor;

		ht->handle = handle;

		ht->prio = tp->prio;



		err = u32_replace_hw_hnode(tp, ht, flags);

		if (err) {

			kfree(ht);

			return err;

		}



		RCU_INIT_POINTER(ht->next, tp_c->hlist);

		rcu_assign_pointer(tp_c->hlist, ht);

		*arg = (unsigned long)ht;



		u32_replace_hw_hnode(tp, ht, flags);

		return 0;

	}