Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be35b982 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by David S. Miller
Browse files

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: default avatarIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e91e2189

drivers/net/ethernet/ti/cpsw.c

+4 −10
Original line number Diff line number Diff line
@@ -2125,15 +2125,9 @@ 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,

	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,

	ret |= cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast,

				  0, ALE_VLAN, vid);

	pm_runtime_put(cpsw->dev);

	return ret;

drivers/net/ethernet/ti/cpsw_ale.c

+1 −1
Original line number Diff line number Diff line
@@ -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);