Skip to content

Commit

Permalink
ehea: fix promiscuous mode
Browse files Browse the repository at this point in the history
commit a4910b7 has broken promiscuous
mode, which is never set. port->promisc just reflects the last setting
of PROMISCUOUS mode to avoid doing an extra hypercall when it's already
set.

However, since it may fail because of hypervisor permissions, we should
still respect the multicast settings and not simply exit after setting
promiscuous mode.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Thadeu Lima de Souza Cascardo authored and David S. Miller committed Apr 26, 2012
1 parent 5d38457 commit 47d59d0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/net/ethernet/ibm/ehea/ehea_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1946,11 +1946,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
struct netdev_hw_addr *ha;
int ret;

if (port->promisc) {
ehea_promiscuous(dev, 1);
return;
}
ehea_promiscuous(dev, 0);
ehea_promiscuous(dev, !!(dev->flags & IFF_PROMISC));

if (dev->flags & IFF_ALLMULTI) {
ehea_allmulti(dev, 1);
Expand Down

0 comments on commit 47d59d0

Please sign in to comment.