From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Ngai-Mint Kwan <ngai-mint.kwan@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, guru.anbalagane@oracle.com,
Jacob Keller <jacob.e.keller@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 1/8] fm10k-shared: use mac-> instead of hw->mac.
Date: Sun, 8 Jan 2017 02:10:27 -0800 [thread overview]
Message-ID: <20170108101034.119851-2-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20170108101034.119851-1-jeffrey.t.kirsher@intel.com>
From: Ngai-Mint Kwan <ngai-mint.kwan@intel.com>
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_common.c b/drivers/net/ethernet/intel/fm10k/fm10k_common.c
index dd95ac4..62a6ad9 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_common.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_common.c
@@ -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;
}
--
2.9.3
next prev parent reply other threads:[~2017-01-08 10:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-08 10:10 [net-next 0/8][pull request] 100GbE Intel Wired LAN Driver Updates 2017-01-08 Jeff Kirsher
2017-01-08 10:10 ` Jeff Kirsher [this message]
2017-01-08 10:10 ` [net-next 2/8] fm10k: remove extraneous variable definition in fm10k_ethtool.c Jeff Kirsher
2017-01-08 10:10 ` [net-next 3/8] fm10k: request reset when mbx->state changes Jeff Kirsher
2017-01-08 10:10 ` [net-next 4/8] fm10k: do not clear global mailbox interrupt bits Jeff Kirsher
2017-01-08 10:10 ` [net-next 5/8] fm10k: bump version number Jeff Kirsher
2017-01-08 10:10 ` [net-next 6/8] fm10k: Limit dma sync of RX buffers to actual packet size Jeff Kirsher
2017-01-08 10:10 ` [net-next 7/8] fm10k: report the receive timestamp in FM10K_CB(skb)->tstamp Jeff Kirsher
2017-01-08 10:10 ` [net-next 8/8] fm10k: remove FM10K_FLAG_DEBUG_STATS Jeff Kirsher
2017-01-08 22:20 ` [net-next 0/8][pull request] 100GbE Intel Wired LAN Driver Updates 2017-01-08 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170108101034.119851-2-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=guru.anbalagane@oracle.com \
--cc=jacob.e.keller@intel.com \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=ngai-mint.kwan@intel.com \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).