diff options
| author | Esben Haabendal <esben@geanix.com> | 2019-05-23 14:02:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-23 09:33:57 -0700 |
| commit | ddc0bf34f9ee202315f8c844bcbdede4e3821f12 (patch) | |
| tree | 339129f1fe0c9daa32694a88ce1b4a9d91f091da /drivers/net/ethernet/xilinx | |
| parent | 5556fdb0c2ea3a9ae18e2c457a25198673761ff7 (diff) | |
| download | linux-ddc0bf34f9ee202315f8c844bcbdede4e3821f12.tar.gz linux-ddc0bf34f9ee202315f8c844bcbdede4e3821f12.tar.bz2 linux-ddc0bf34f9ee202315f8c844bcbdede4e3821f12.zip | |
net: ll_temac: Do not make promiscuous mode sticky on multicast
When user has requested IFF_ALLMULTI or have set more than 4 multicast
addresses, we should just use promiscuous mode, but not set it in flags,
as it causes the interface to stay in promiscuous mode even when the
non-IFF_PROMISC condition that caused promiscuous mode to be enabled
has gone away.
Signed-off-by: Esben Haabendal <esben@geanix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx')
| -rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 14870d659f7d..65fb549241b2 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -389,13 +389,6 @@ static void temac_set_multicast_list(struct net_device *ndev) mutex_lock(lp->indirect_mutex); if (ndev->flags & (IFF_ALLMULTI | IFF_PROMISC) || netdev_mc_count(ndev) > MULTICAST_CAM_TABLE_NUM) { - /* - * We must make the kernel realise we had to move - * into promisc mode or we start all out war on - * the cable. If it was a promisc request the - * flag is already set. If not we assert it. - */ - ndev->flags |= IFF_PROMISC; temac_indirect_out32(lp, XTE_AFM_OFFSET, XTE_AFM_EPPRM_MASK); dev_info(&ndev->dev, "Promiscuous mode enabled.\n"); } else if (!netdev_mc_empty(ndev)) { |