net: ethernet: ti: cpsw: clear all entries when delete vid [Linux 4.18]

This Linux kernel change "net: ethernet: ti: cpsw: clear all entries when delete vid" is included in the Linux 4.18 release. This change is authored by Ivan Khoronzhuk <ivan.khoronzhuk [at] linaro.org> on Fri Aug 10 15:47:08 2018 +0300. The commit for this change in Linux stable tree is be35b98 (patch).

net: ethernet: ti: cpsw: clear all entries when delete vid

In cases if some of the entries were not found in forwarding table
while killing vlan, the rest not needed entries still left in the
table. No need to stop, as entry was deleted anyway. So fix this by
returning error only after all was cleaned. To implement this, return
-ENOENT in cpsw_ale_del_mcast() as it's supposed to be.

Signed-off-by: Ivan Khoronzhuk <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

There are 16 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/ethernet/ti/cpsw.c     | 14 ++++----------
 drivers/net/ethernet/ti/cpsw_ale.c |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 358edab..9edac67 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2125,16 +2125,10 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev,

    dev_info(priv->dev, "removing vlanid %d from vlan filter\n", vid);
    ret = cpsw_ale_del_vlan(cpsw->ale, vid, 0);
-   if (ret != 0)
-       return ret;
-
-   ret = cpsw_ale_del_ucast(cpsw->ale, priv->mac_addr,
-                HOST_PORT_NUM, ALE_VLAN, vid);
-   if (ret != 0)
-       return ret;
-
-   ret = cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast,
-                0, ALE_VLAN, vid);
+   ret |= cpsw_ale_del_ucast(cpsw->ale, priv->mac_addr,
+                 HOST_PORT_NUM, ALE_VLAN, vid);
+   ret |= cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast,
+                 0, ALE_VLAN, vid);
    pm_runtime_put(cpsw->dev);
    return ret;
 }
diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c
index 93dc05c..5766225 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.c
+++ b/drivers/net/ethernet/ti/cpsw_ale.c
@@ -394,7 +394,7 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, u8 *addr, int port_mask,

    idx = cpsw_ale_match_addr(ale, addr, (flags & ALE_VLAN) ? vid : 0);
    if (idx < 0)
-       return -EINVAL;
+       return -ENOENT;

    cpsw_ale_read(ale, idx, ale_entry);

Leave a Reply

Your email address will not be published. Required fields are marked *