bonding: propogate vlan_features to bonding master

[linux.git] / drivers / net / s6gmac.c

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index 5345e47b35ac9c19ea11198810b442af6f5ecae8..4525cbe8dd69c0dd2585568eb28555b6ff2205b9 100644 (file)
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -793,7 +793,7 @@ static inline int s6gmac_phy_start(struct net_device *dev)
        struct s6gmac *pd = netdev_priv(dev);
        int i = 0;
        struct phy_device *p = NULL;
-       while ((!(p = pd->mii.bus->phy_map[i])) && (i < PHY_MAX_ADDR))
+       while ((i < PHY_MAX_ADDR) && (!(p = pd->mii.bus->phy_map[i])))
                i++;
        p = phy_connect(dev, dev_name(&p->dev), &s6gmac_adjust_link, 0,
                        PHY_INTERFACE_MODE_RGMII);