Skip to content

Commit 1c6c09a

Browse files
vladimirolteandavem330
authored andcommitted
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 <[email protected]> Fixes: e0a7683 ("net/sched: cbs: fix port_rate miscalculation") Acked-by: Vinicius Costa Gomes <[email protected]> Signed-off-by: Vladimir Oltean <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f04b514 commit 1c6c09a

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

net/sched/sch_cbs.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,6 @@ static struct sk_buff *cbs_dequeue_soft(struct Qdisc *sch)
181181
s64 credits;
182182
int len;
183183

184-
if (atomic64_read(&q->port_rate) == -1) {
185-
WARN_ONCE(1, "cbs: dequeue() called with unknown port rate.");
186-
return NULL;
187-
}
188-
189184
if (q->credits < 0) {
190185
credits = timediff_to_credits(now - q->last, q->idleslope);
191186

@@ -303,11 +298,19 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,
303298
static void cbs_set_port_rate(struct net_device *dev, struct cbs_sched_data *q)
304299
{
305300
struct ethtool_link_ksettings ecmd;
301+
int speed = SPEED_10;
306302
int port_rate = -1;
303+
int err;
304+
305+
err = __ethtool_get_link_ksettings(dev, &ecmd);
306+
if (err < 0)
307+
goto skip;
308+
309+
if (ecmd.base.speed != SPEED_UNKNOWN)
310+
speed = ecmd.base.speed;
307311

308-
if (!__ethtool_get_link_ksettings(dev, &ecmd) &&
309-
ecmd.base.speed != SPEED_UNKNOWN)
310-
port_rate = ecmd.base.speed * 1000 * BYTES_PER_KBIT;
312+
skip:
313+
port_rate = speed * 1000 * BYTES_PER_KBIT;
311314

312315
atomic64_set(&q->port_rate, port_rate);
313316
netdev_dbg(dev, "cbs: set %s's port_rate to: %lld, linkspeed: %d\n",

0 commit comments

Comments
 (0)