X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fnet%2Fdsa%2Fslave.c;h=57978c5b2c91dbabd8df9f4743a80579c52f434c;hb=refs%2Fchanges%2F53%2F2653%2F1;hp=827cda560a552b7b0dca45d49a06816e6dda513b;hpb=342fa5dfa053559f47caad657132522496dcf1b3;p=kvmfornfv.git

diff --git a/kernel/net/dsa/slave.c b/kernel/net/dsa/slave.c
index 827cda560..57978c5b2 100644
--- 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);