A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source
This commit is contained in:
David S. Miller 2018-11-19 10:55:00 -08:00
commit f2be6d710d
204 changed files with 1829 additions and 1121 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/sched/act_pedit.c
View file

@ -201,7 +201,8 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
goto out_release;
}
} else {
return err;
ret = err;
goto out_free;
}
p = to_pedit(*a);

29
net/sched/sch_fq.c
View file

@ -476,22 +476,29 @@ begin:
goto begin;
}
prefetch(&skb->end);
f->credit -= qdisc_pkt_len(skb);
plen = qdisc_pkt_len(skb);
f->credit -= plen;
if (ktime_to_ns(skb->tstamp) || !q->rate_enable)
if (!q->rate_enable)
goto out;
rate = q->flow_max_rate;
if (skb->sk)
rate = min(skb->sk->sk_pacing_rate, rate);
if (rate <= q->low_rate_threshold) {
f->credit = 0;
plen = qdisc_pkt_len(skb);
} else {
plen = max(qdisc_pkt_len(skb), q->quantum);
if (f->credit > 0)
goto out;
/* If EDT time was provided for this skb, we need to
* update f->time_next_packet only if this qdisc enforces
* a flow max rate.
*/
if (!skb->tstamp) {
if (skb->sk)
rate = min(skb->sk->sk_pacing_rate, rate);
if (rate <= q->low_rate_threshold) {
f->credit = 0;
} else {
plen = max(plen, q->quantum);
if (f->credit > 0)
goto out;
}
}
if (rate != ~0UL) {
u64 len = (u64)plen * NSEC_PER_SEC;