be2net: restore properly promisc mode after queues reconfiguration

Orabug: 27615319

The commit 622190669403 ("be2net: Request RSS capability of Rx interface
depending on number of Rx rings") modified be_update_queues() so the
IFACE (HW representation of the netdevice) is destroyed and then
re-created. This causes a regression because potential promiscuous mode
is not restored properly during be_open() because the driver thinks
that the HW has promiscuous mode already enabled.

Note that Lancer is not affected by this bug because RX-filter flags are
disabled during be_close() for this chipset.

Cc: Sathya Perla <sathya.perla@broadcom.com>
Cc: Ajit Khaparde <ajit.khaparde@broadcom.com>
Cc: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Cc: Somnath Kotur <somnath.kotur@broadcom.com>
Fixes: 622190669403 ("be2net: Request RSS capability of Rx interface depending on number of Rx rings")
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 52acf06451930eb4cefabd5ecea56e2d46c32f76)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index eaadf80a757371486a5152c1a5d67a76a8835cf3..b1a703124b1261e4fdd060060f403691925477ec 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4620,6 +4620,15 @@ int be_update_queues(struct be_adapter *adapter)
 
        be_schedule_worker(adapter);
 
+       /*
+        * The IF was destroyed and re-created. We need to clear
+        * all promiscuous flags valid for the destroyed IF.
+        * Without this promisc mode is not restored during
+        * be_open() because the driver thinks that it is
+        * already enabled in HW.
+        */
+       adapter->if_flags &= ~BE_IF_FLAGS_ALL_PROMISCUOUS;
+
        if (netif_running(netdev))
                status = be_open(netdev);