fm10k-shared: use mac-> instead of hw->mac.
authorNgai-Mint Kwan <ngai-mint.kwan@intel.com>
Wed, 2 Nov 2016 23:44:44 +0000 (16:44 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 8 Jan 2017 09:22:57 +0000 (01:22 -0800)
Since a pointer "mac" to fm10k_mac_info structure exists, use it to
access the contents of its members.

Signed-off-by: Ngai-Mint Kwan <ngai-mint.kwan@intel.com>
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_common.c

index dd95ac4..62a6ad9 100644 (file)
@@ -506,7 +506,7 @@ s32 fm10k_get_host_state_generic(struct fm10k_hw *hw, bool *host_ready)
                goto out;
 
        /* if we somehow dropped the Tx enable we should reset */
-       if (hw->mac.tx_ready && !(txdctl & FM10K_TXDCTL_ENABLE)) {
+       if (mac->tx_ready && !(txdctl & FM10K_TXDCTL_ENABLE)) {
                ret_val = FM10K_ERR_RESET_REQUESTED;
                goto out;
        }
@@ -523,8 +523,8 @@ s32 fm10k_get_host_state_generic(struct fm10k_hw *hw, bool *host_ready)
 
        /* interface cannot receive traffic without logical ports */
        if (mac->dglort_map == FM10K_DGLORTMAP_NONE) {
-               if (hw->mac.ops.request_lport_map)
-                       ret_val = hw->mac.ops.request_lport_map(hw);
+               if (mac->ops.request_lport_map)
+                       ret_val = mac->ops.request_lport_map(hw);
 
                goto out;
        }