Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-19 12:18:31 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-19 12:22:14 +0200
commita6fd2c665abc3e757b7bddacc85a57120cc039ab (patch)
tree51da839b3d80a1fc7c9c5263d1a28b60c8d42ef2
parentbf06705e85196d57eebf847a8b7c34faeeccc0a6 (diff)
fm10k: don't protect fm10k_queue_mac_request by
fm10k_host_mbx_ready (bsc#1101813 FATE#325148). suse-commit: c3d01482c7b00ed10855298b0dbb3987da2a7f95
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_netdev.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index ce95b17e9efd..0f53aa89658a 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -1546,12 +1546,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_MULTI);
- 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;
@@ -1592,12 +1592,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;