be2net: skip multicast promiscuos setting in already set

Set mc-promisc (multicast promiscuous) mode on an interface, only if it is
*not already* in that mode.

Also removed logs that report interface being set to multicast
promiscous mode. In an earlier comment on the netdev list such log messages
were deemed unnecessary as this behaviour is common across most of the
ethernet drivers.

Signed-off-by: Kalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 31c376628bfdac0158f61aef1aef3ee1aaac7e1b..2e7c5553955e739ba717568325a2c1be67a15c47 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -374,6 +374,7 @@ enum vf_state {
 #define BE_FLAGS_LINK_STATUS_INIT              1
 #define BE_FLAGS_WORKER_SCHEDULED              (1 << 3)
 #define BE_FLAGS_VLAN_PROMISC                  (1 << 4)
+#define BE_FLAGS_MCAST_PROMISC                 (1 << 5)
 #define BE_FLAGS_NAPI_ENABLED                  (1 << 9)
 #define BE_FLAGS_QNQ_ASYNC_EVT_RCVD            (1 << 11)
 #define BE_FLAGS_VXLAN_OFFLOADS                        (1 << 12)

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index e1d445dd856413d2371620bd10444c29b2bed64f..9116d5e26dab4223dda1ce99671037a678eedcbc 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1190,7 +1190,7 @@ ret:
 static void be_clear_promisc(struct be_adapter *adapter)
 {
        adapter->promiscuous = false;
-       adapter->flags &= ~BE_FLAGS_VLAN_PROMISC;
+       adapter->flags &= ~(BE_FLAGS_VLAN_PROMISC | BE_FLAGS_MCAST_PROMISC);
 
        be_cmd_rx_filter(adapter, IFF_PROMISC, OFF);
 }
@@ -1215,10 +1215,8 @@ static void be_set_rx_mode(struct net_device *netdev)
 
        /* Enable multicast promisc if num configured exceeds what we support */
        if (netdev->flags & IFF_ALLMULTI ||
-           netdev_mc_count(netdev) > be_max_mc(adapter)) {
-               be_cmd_rx_filter(adapter, IFF_ALLMULTI, ON);
-               goto done;
-       }
+           netdev_mc_count(netdev) > be_max_mc(adapter))
+               goto set_mcast_promisc;
 
        if (netdev_uc_count(netdev) != adapter->uc_macs) {
                struct netdev_hw_addr *ha;
@@ -1244,15 +1242,22 @@ static void be_set_rx_mode(struct net_device *netdev)
        }
 
        status = be_cmd_rx_filter(adapter, IFF_MULTICAST, ON);
-
-       /* Set to MCAST promisc mode if setting MULTICAST address fails */
-       if (status) {
-               dev_info(&adapter->pdev->dev,
-                        "Exhausted multicast HW filters.\n");
-               dev_info(&adapter->pdev->dev,
-                        "Disabling HW multicast filtering.\n");
-               be_cmd_rx_filter(adapter, IFF_ALLMULTI, ON);
+       if (!status) {
+               if (adapter->flags & BE_FLAGS_MCAST_PROMISC)
+                       adapter->flags &= ~BE_FLAGS_MCAST_PROMISC;
+               goto done;
        }
+
+set_mcast_promisc:
+       if (adapter->flags & BE_FLAGS_MCAST_PROMISC)
+               return;
+
+       /* Set to MCAST promisc mode if setting MULTICAST address fails
+        * or if num configured exceeds what we support
+        */
+       status = be_cmd_rx_filter(adapter, IFF_ALLMULTI, ON);
+       if (!status)
+               adapter->flags |= BE_FLAGS_MCAST_PROMISC;
 done:
        return;
 }