diff options
| author | Jose Abreu | 2018-06-15 17:17:27 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-06-15 18:38:52 +0200 |
| commit | 7cfde0af731c14664e3882c7ba77ace1059f2c5e (patch) | |
| tree | 596207da1c3aba8a6cd0cb7e22065aeaed1faa62 /drivers/net/ethernet/stmicro/stmmac/hwif.c | |
| parent | neighbour: skip NTF_EXT_LEARNED entries during forced gc (diff) | |
| download | kernel-qcow2-linux-7cfde0af731c14664e3882c7ba77ace1059f2c5e.tar.gz kernel-qcow2-linux-7cfde0af731c14664e3882c7ba77ace1059f2c5e.tar.xz kernel-qcow2-linux-7cfde0af731c14664e3882c7ba77ace1059f2c5e.zip | |
net: stmmac: Run HWIF Quirks after getting HW caps
Currently we were running HWIF quirks before getting HW capabilities.
This is not right because some HWIF callbacks depend on HW caps.
Lets save the quirks callback and use it in a later stage.
This fixes Altera socfpga.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Fixes: 5f0456b43140 ("net: stmmac: Implement logic to automatically select HW Interface")
Reported-by: Dinh Nguyen <dinh.linux@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Vitor Soares <soares@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/hwif.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c index 14770fc8865e..1f50e83cafb2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -252,13 +252,8 @@ int stmmac_hwif_init(struct stmmac_priv *priv) return ret; } - /* Run quirks, if needed */ - if (entry->quirks) { - ret = entry->quirks(priv); - if (ret) - return ret; - } - + /* Save quirks, if needed for posterior use */ + priv->hwif_quirks = entry->quirks; return 0; } |