projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
hisilicon
/
hns
/
hns_ethtool.c
diff --git
a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index
47e59bb
..
87d5c94
100644
(file)
--- a/
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@
-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;
}