hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/sched: cbs: Set default link speed to 10 Mbps in cbs_set_port_rate 

The discussion to be made is absolutely the same as in the case of
previous patch ("taprio: Set default link speed to 10 Mbps in
taprio_set_picos_per_byte"). Nothing is lost when setting a default.

Cc: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
Fixes: e0a7683d30 ("net/sched: cbs: fix port_rate miscalculation")
Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2019-08-30 04:07:23 +03:00 committed by David S. Miller
parent f04b514c0c
commit 1c6c09a0ae
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/sched/sch_cbs.c
View File

@ -181,11 +181,6 @@ static struct sk_buff *cbs_dequeue_soft(struct Qdisc *sch)
s64 credits; s64 credits;
int len; int len;
if (atomic64_read(&q->port_rate) == -1) {
WARN_ONCE(1, "cbs: dequeue() called with unknown port rate.");
return NULL;
}
if (q->credits < 0) { if (q->credits < 0) {
credits = timediff_to_credits(now - q->last, q->idleslope); credits = timediff_to_credits(now - q->last, q->idleslope);
@ -303,11 +298,19 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,
static void cbs_set_port_rate(struct net_device *dev, struct cbs_sched_data *q) static void cbs_set_port_rate(struct net_device *dev, struct cbs_sched_data *q)
{ {
struct ethtool_link_ksettings ecmd; struct ethtool_link_ksettings ecmd;
int speed = SPEED_10;
int port_rate = -1; int port_rate = -1;
int err;
if (!__ethtool_get_link_ksettings(dev, &ecmd) && err = __ethtool_get_link_ksettings(dev, &ecmd);
ecmd.base.speed != SPEED_UNKNOWN) if (err < 0)
port_rate = ecmd.base.speed * 1000 * BYTES_PER_KBIT; goto skip;
if (ecmd.base.speed != SPEED_UNKNOWN)
speed = ecmd.base.speed;
skip:
port_rate = speed * 1000 * BYTES_PER_KBIT;
atomic64_set(&q->port_rate, port_rate); atomic64_set(&q->port_rate, port_rate);
netdev_dbg(dev, "cbs: set %s's port_rate to: %lld, linkspeed: %d\n", netdev_dbg(dev, "cbs: set %s's port_rate to: %lld, linkspeed: %d\n",