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

Commit 1dff5d7b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: tc_qdisc_flow_control returning qdisc size"

parents baa22486 b407e473

include/net/pkt_sched.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ extern int tc_classify_compat(struct sk_buff *skb, const struct tcf_proto *tp, 
			      struct tcf_result *res);

extern int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,

		       struct tcf_result *res);

extern void tc_qdisc_flow_control(struct net_device *dev, u32 tcm_handle,

extern int tc_qdisc_flow_control(struct net_device *dev, u32 tcm_handle,

				  int flow_enable);

/* Calculate maximal size of packet seen by hard_start_xmit

   routine of this device.

net/sched/sch_api.c

+4 −1
Original line number Diff line number Diff line
@@ -1080,10 +1080,11 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n) 
/*

 * enable/disable flow on qdisc.

 */

void

int

tc_qdisc_flow_control(struct net_device *dev, u32 tcm_handle, int enable_flow)

{

	struct Qdisc *q;

	int qdisc_len = 0;

	struct __qdisc_change_req {

		struct nlattr attr;

		struct tc_prio_qopt data;
@@ -1100,9 +1101,11 @@ tc_qdisc_flow_control(struct net_device *dev, u32 tcm_handle, int enable_flow) 


	/* call registered change function */

	if (q) {

		qdisc_len = q->q.qlen;

		if (q->ops->change(q, &(req.attr)) != 0)

			pr_err("tc_qdisc_flow_control: qdisc change failed");

	}

	return qdisc_len;

}

EXPORT_SYMBOL(tc_qdisc_flow_control);