Unverified Commit 5df00e76 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13934 net/sched: accept TCA_STAB only for root qdisc 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ORYHE664LF5DKDRSA2BB7QGEZBANNBQR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRJQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/13934

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents e30b9953 33c5d945

include/net/sch_generic.h

+0 −1
Original line number Diff line number Diff line
@@ -838,7 +838,6 @@ static inline void qdisc_calculate_pkt_len(struct sk_buff *skb, 
static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,

				struct sk_buff **to_free)

{

	qdisc_calculate_pkt_len(skb, sch);

	return sch->enqueue(skb, sch, to_free);

}

net/sched/sch_api.c

+6 −1
Original line number Diff line number Diff line
@@ -590,7 +590,6 @@ void __qdisc_calculate_pkt_len(struct sk_buff *skb, 
		pkt_len = 1;

	qdisc_skb_cb(skb)->pkt_len = pkt_len;

}

EXPORT_SYMBOL(__qdisc_calculate_pkt_len);



void qdisc_warn_nonwc(const char *txt, struct Qdisc *qdisc)

{
@@ -1120,6 +1119,12 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, 
			return -EINVAL;

		}



		if (new &&

		    !(parent->flags & TCQ_F_MQROOT) &&

		    rcu_access_pointer(new->stab)) {

			NL_SET_ERR_MSG(extack, "STAB not supported on a non root");

			return -EINVAL;

		}

		err = cops->graft(parent, cl, new, &old, extack);

		if (err)

			return err;