diff options
| author | Jose Abreu <Jose.Abreu@synopsys.com> | 2020-04-01 19:29:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-01 11:25:03 -0700 |
| commit | dd6a4998e64a7806b54c3eba1e5e7bf6c81ccf8c (patch) | |
| tree | dcd32e9f4a3460c8f890ce5529760680b5a5f7f5 /drivers/net | |
| parent | cc213f8c47fbd4eeb6c3a4fa9b8c20d14f8bc8f4 (diff) | |
| download | linux-dd6a4998e64a7806b54c3eba1e5e7bf6c81ccf8c.tar.gz linux-dd6a4998e64a7806b54c3eba1e5e7bf6c81ccf8c.tar.bz2 linux-dd6a4998e64a7806b54c3eba1e5e7bf6c81ccf8c.zip | |
net: stmmac: Fix VLAN filtering when HW does not support it
If we don't have any filters available we can't rely upon the return
code of stmmac_add_hw_vlan_rx_fltr() / stmmac_del_hw_vlan_rx_fltr(). Add
a check for this.
Fixes: ed64639bc1e0 ("net: stmmac: Add support for VLAN Rx filtering")
Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 2fb671e61ee8..e6898fd5223f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4566,9 +4566,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid return ret; } - ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid); + if (priv->hw->num_vlan) { + ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid); + if (ret) + return ret; + } - return ret; + return 0; } static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid) @@ -4581,9 +4585,12 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi is_double = true; clear_bit(vid, priv->active_vlans); - ret = stmmac_del_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid); - if (ret) - return ret; + + if (priv->hw->num_vlan) { + ret = stmmac_del_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid); + if (ret) + return ret; + } return stmmac_vlan_update(priv, is_double); } |