fm10k: don't protect fm10k_queue_mac_request by fm10k_host_mbx_ready
authorJacob Keller <jacob.e.keller@intel.com>
Thu, 12 Apr 2018 18:15:59 +0000 (11:15 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 9 May 2018 16:02:48 +0000 (09:02 -0700)
We don't actually need to check if the host mbx is ready when queuing
MAC requests, because these are not handled by a special queue which
queues up requests until the mailbox is capable of handling them.

Pull these requests outside the fm10k_host_mbx_ready() check, as it is
not necessary.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

index 0dc9f2d..929f538 100644 (file)
@@ -1537,12 +1537,12 @@ static void *fm10k_dfwd_add_station(struct net_device *dev,
 
        glort = l2_accel->dglort + 1 + i;
 
-       if (fm10k_host_mbx_ready(interface)) {
+       if (fm10k_host_mbx_ready(interface))
                hw->mac.ops.update_xcast_mode(hw, glort,
                                              FM10K_XCAST_MODE_NONE);
-               fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
-                                       hw->mac.default_vid, true);
-       }
+
+       fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
+                               hw->mac.default_vid, true);
 
        for (vid = fm10k_find_next_vlan(interface, 0);
             vid < VLAN_N_VID;
@@ -1583,12 +1583,12 @@ static void fm10k_dfwd_del_station(struct net_device *dev, void *priv)
 
        glort = l2_accel->dglort + 1 + i;
 
-       if (fm10k_host_mbx_ready(interface)) {
+       if (fm10k_host_mbx_ready(interface))
                hw->mac.ops.update_xcast_mode(hw, glort,
                                              FM10K_XCAST_MODE_NONE);
-               fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
-                                       hw->mac.default_vid, false);
-       }
+
+       fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
+                               hw->mac.default_vid, false);
 
        for (vid = fm10k_find_next_vlan(interface, 0);
             vid < VLAN_N_VID;