Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford...
[muen/linux.git] / drivers / net / ethernet / hisilicon / hns / hns_ethtool.c
index 47e59bbfd061bfe1d9576b8111f92d361be599e1..87d5c94b2810230b334ddef0501644cd291b8bbf 100644 (file)
@@ -352,6 +352,13 @@ static int __lb_setup(struct net_device *ndev,
                break;
        }
 
+       if (!ret) {
+               if (loop == MAC_LOOP_NONE)
+                       h->dev->ops->set_promisc_mode(
+                               h, ndev->flags & IFF_PROMISC);
+               else
+                       h->dev->ops->set_promisc_mode(h, 1);
+       }
        return ret;
 }