X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=net%2Fdsa%2Fslave.c;h=35c47ddd04f0ee3eb965fd99b06bab2ee4670774;hb=211c504a444710b1d8ce3431ac19f2578602ca27;hp=04ffad311704852a5d2c35c99eea2f1c4293f5e1;hpb=0890a264794f33df540fbaf274699146903b4e6b;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 04ffad311704..35c47ddd04f0 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -112,7 +112,7 @@ static int dsa_slave_open(struct net_device *dev)
 
 clear_promisc:
 	if (dev->flags & IFF_PROMISC)
-		dev_set_promiscuity(master, 0);
+		dev_set_promiscuity(master, -1);
 clear_allmulti:
 	if (dev->flags & IFF_ALLMULTI)
 		dev_set_allmulti(master, -1);
@@ -756,7 +756,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);