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.
Unified · Split
| @@ -2125,16 +2125,10 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev, · 2124 unmodified lines | |||
| 2125 | 2125 | ||
| 2126 | dev_info(priv->dev, "removing vlanid %d from vlan filter\n", vid); | 2126 | dev_info(priv->dev, "removing vlanid %d from vlan filter\n", vid); |
| 2127 | ret = cpsw_ale_del_vlan(cpsw->ale, vid, 0); | 2127 | ret = cpsw_ale_del_vlan(cpsw->ale, vid, 0); |
| 2128 | if (ret != 0) | 2128 | ret |= cpsw_ale_del_ucast(cpsw->ale, priv->mac_addr, |
| 2129 | return ret; | 2129 | HOST_PORT_NUM, ALE_VLAN, vid); |
| 2130 | 2130 | ret |= cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast, | |
| 2131 | ret = cpsw_ale_del_ucast(cpsw->ale, priv->mac_addr, | 2131 | 0, ALE_VLAN, vid); |
| 2132 | HOST_PORT_NUM, ALE_VLAN, vid); | ||
| 2133 | if (ret != 0) | ||
| 2134 | return ret; | ||
| 2135 | |||
| 2136 | ret = cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast, | ||
| 2137 | 0, ALE_VLAN, vid); | ||
| 2138 | pm_runtime_put(cpsw->dev); | 2132 | pm_runtime_put(cpsw->dev); |
| 2139 | return ret; | 2133 | return ret; |
| 2140 | } | 2134 | } |
| @@ -394,7 +394,7 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, u8 *addr, int port_mask, · 393 unmodified lines | |||
| 394 | 394 | ||
| 395 | idx = cpsw_ale_match_addr(ale, addr, (flags & ALE_VLAN) ? vid : 0); | 395 | idx = cpsw_ale_match_addr(ale, addr, (flags & ALE_VLAN) ? vid : 0); |
| 396 | if (idx < 0) | 396 | if (idx < 0) |
| 397 | return -EINVAL; | 397 | return -ENOENT; |
| 398 | 398 | ||
| 399 | cpsw_ale_read(ale, idx, ale_entry); | 399 | cpsw_ale_read(ale, idx, ale_entry); |
| 400 | 400 | ||