diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-25 14:57:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-25 14:57:26 -0800 |
| commit | adf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312 (patch) | |
| tree | f1ba8b47d05b9e30cd3ed11cc06fc524e1aba7c9 /drivers/net/dsa | |
| parent | c431047c4efe7903fb1c5a23e0f3f8eb1efc89f9 (diff) | |
| parent | e58c1912418980f57ba2060017583067f5f71e52 (diff) | |
| download | blackbird-op-linux-adf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312.tar.gz blackbird-op-linux-adf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in networking bug fixes for merge window.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c index b60224c55244..a51ac088c0bc 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -557,15 +557,15 @@ static int sja1105_parse_rgmii_delays(struct sja1105_private *priv, int i; for (i = 0; i < SJA1105_NUM_PORTS; i++) { - if (ports->role == XMII_MAC) + if (ports[i].role == XMII_MAC) continue; - if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID || - ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID) + if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_RXID || + ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID) priv->rgmii_rx_delay[i] = true; - if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID || - ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID) + if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_TXID || + ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID) priv->rgmii_tx_delay[i] = true; if ((priv->rgmii_rx_delay[i] || priv->rgmii_tx_delay[i]) && |
