Skip to content

Commit cdd2883

Browse files
Danielmachondavem330
authored andcommitted
net: microchip: sparx5: fix deletion of existing DSCP mappings
Fix deletion of existing DSCP mappings in the APP table. Adding and deleting DSCP entries are replicated per-port, since the mapping table is global for all ports in the chip. Whenever a mapping for a DSCP value already exists, the old mapping is deleted first. However, it is only deleted for the specified port. Fix this by calling sparx5_dcb_ieee_delapp() instead of dcb_ieee_delapp() as it ought to be. Reproduce: // Map and remap DSCP value 63 $ dcb app add dev eth0 dscp-prio 63:1 $ dcb app add dev eth0 dscp-prio 63:2 $ dcb app show dev eth0 dscp-prio dscp-prio 63:2 $ dcb app show dev eth1 dscp-prio dscp-prio 63:1 63:2 <-- 63:1 should not be there Fixes: 8dcf69a ("net: microchip: sparx5: add support for offloading dscp table") Signed-off-by: Daniel Machon <daniel.machon@microchip.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ea9dd2e commit cdd2883

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,21 @@ static int sparx5_dcb_ieee_dscp_setdel(struct net_device *dev,
249249
return 0;
250250
}
251251

252+
static int sparx5_dcb_ieee_delapp(struct net_device *dev, struct dcb_app *app)
253+
{
254+
int err;
255+
256+
if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP)
257+
err = sparx5_dcb_ieee_dscp_setdel(dev, app, dcb_ieee_delapp);
258+
else
259+
err = dcb_ieee_delapp(dev, app);
260+
261+
if (err < 0)
262+
return err;
263+
264+
return sparx5_dcb_app_update(dev);
265+
}
266+
252267
static int sparx5_dcb_ieee_setapp(struct net_device *dev, struct dcb_app *app)
253268
{
254269
struct dcb_app app_itr;
@@ -264,7 +279,7 @@ static int sparx5_dcb_ieee_setapp(struct net_device *dev, struct dcb_app *app)
264279
if (prio) {
265280
app_itr = *app;
266281
app_itr.priority = prio;
267-
dcb_ieee_delapp(dev, &app_itr);
282+
sparx5_dcb_ieee_delapp(dev, &app_itr);
268283
}
269284

270285
if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP)
@@ -281,21 +296,6 @@ static int sparx5_dcb_ieee_setapp(struct net_device *dev, struct dcb_app *app)
281296
return err;
282297
}
283298

284-
static int sparx5_dcb_ieee_delapp(struct net_device *dev, struct dcb_app *app)
285-
{
286-
int err;
287-
288-
if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP)
289-
err = sparx5_dcb_ieee_dscp_setdel(dev, app, dcb_ieee_delapp);
290-
else
291-
err = dcb_ieee_delapp(dev, app);
292-
293-
if (err < 0)
294-
return err;
295-
296-
return sparx5_dcb_app_update(dev);
297-
}
298-
299299
static int sparx5_dcb_setapptrust(struct net_device *dev, u8 *selectors,
300300
int nselectors)
301301
{

0 commit comments

Comments
 (0)