These changes are a raw update to a vanilla kernel 4.1.10, with the

[kvmfornfv.git] / kernel / net / dsa / slave.c

diff --git a/kernel/net/dsa/slave.c b/kernel/net/dsa/slave.c
index 827cda5..57978c5 100644 (file)
--- a/kernel/net/dsa/slave.c
+++ b/kernel/net/dsa/slave.c
@@ -732,7 +732,8 @@ static int dsa_slave_phy_connect(struct dsa_slave_priv *p,
                return -ENODEV;
 
        /* Use already configured phy mode */
-       p->phy_interface = p->phy->interface;
+       if (p->phy_interface == PHY_INTERFACE_MODE_NA)
+               p->phy_interface = p->phy->interface;
        phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link,
                           p->phy_interface);