From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, gerlitz.or@gmail.com,
Shannon Nelson <shannon.nelson@intel.com>,
Kamil Krawczyk <kamil.krawczyk@intel.com>
Subject: [net-next v2 12/17] i40e: AQ API updates
Date: Fri, 16 Jan 2015 05:29:01 -0800 [thread overview]
Message-ID: <1421414946-22179-13-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1421414946-22179-1-git-send-email-jeffrey.t.kirsher@intel.com>
Fix up NVM config read and write data structs.
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Kamil Krawczyk <kamil.krawczyk@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 10 +++++-----
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
index 20cada5..70b8e55 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
@@ -1831,12 +1831,12 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_nvm_update);
/* NVM Config Read (indirect 0x0704) */
struct i40e_aqc_nvm_config_read {
__le16 cmd_flags;
-#define ANVM_SINGLE_OR_MULTIPLE_FEATURES_MASK 1
-#define ANVM_READ_SINGLE_FEATURE 0
-#define ANVM_READ_MULTIPLE_FEATURES 1
+#define I40E_AQ_ANVM_SINGLE_OR_MULTIPLE_FEATURES_MASK 1
+#define I40E_AQ_ANVM_READ_SINGLE_FEATURE 0
+#define I40E_AQ_ANVM_READ_MULTIPLE_FEATURES 1
__le16 element_count;
- __le16 element_id; /* Feature/field ID */
- u8 reserved[2];
+ __le16 element_id; /* Feature/field ID */
+ __le16 element_id_msw; /* MSWord of field ID */
__le32 address_high;
__le32 address_low;
};
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
index 1b80846..5363cbf 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
@@ -1831,12 +1831,12 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_nvm_update);
/* NVM Config Read (indirect 0x0704) */
struct i40e_aqc_nvm_config_read {
__le16 cmd_flags;
-#define ANVM_SINGLE_OR_MULTIPLE_FEATURES_MASK 1
-#define ANVM_READ_SINGLE_FEATURE 0
-#define ANVM_READ_MULTIPLE_FEATURES 1
+#define I40E_AQ_ANVM_SINGLE_OR_MULTIPLE_FEATURES_MASK 1
+#define I40E_AQ_ANVM_READ_SINGLE_FEATURE 0
+#define I40E_AQ_ANVM_READ_MULTIPLE_FEATURES 1
__le16 element_count;
- __le16 element_id; /* Feature/field ID */
- u8 reserved[2];
+ __le16 element_id; /* Feature/field ID */
+ __le16 element_id_msw; /* MSWord of field ID */
__le32 address_high;
__le32 address_low;
};
--
1.9.3
next prev parent reply other threads:[~2015-01-16 13:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 13:28 [net-next v2 00/17][pull request] Intel Wired LAN Driver Updates 2015-01-16 Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 01/17] i40e/i40evf: AdminQ updates ww36 Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 02/17] i40e/i40evf: Increase ASQ timeout Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 03/17] i40e: fix proc/int descriptions Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 04/17] i40e: don't give up on DCB error after reset Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 05/17] i40e: Add define for interrupt name string len Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 06/17] i40e: Dump Stats string removed from debugfs help command Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 07/17] i40e/i40evf: Bump i40e/i40evf versions Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 08/17] i40e: only enable PTP interrupt cause if PTP is enabled Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 09/17] i40e: check I40E_FLAG_PTP before handling Tx or Rx timestamps Jeff Kirsher
2015-01-16 13:28 ` [net-next v2 10/17] i40e: Issue "Stop LLDP" command for firmware older than v4.3 Jeff Kirsher
2015-01-16 13:29 ` [net-next v2 11/17] i40e: add more struct size checks Jeff Kirsher
2015-01-16 13:29 ` Jeff Kirsher [this message]
2015-01-16 13:29 ` [net-next v2 13/17] i40e: AQ API updates for new commands Jeff Kirsher
2015-01-16 13:29 ` [net-next v2 14/17] i40e: use same check for Rx hang as for Rx timestamps Jeff Kirsher
2015-01-16 13:29 ` [net-next v2 15/17] i40e: when Rx timestamps disabled set specific mode Jeff Kirsher
2015-01-16 13:29 ` [net-next v2 16/17] i40e: Support for NPAR iSCSI partition with DCB Jeff Kirsher
2015-01-16 13:29 ` [net-next v2 17/17] i40e/i40evf: Bump i40e and i40evf versions Jeff Kirsher
2015-01-18 1:34 ` [net-next v2 00/17][pull request] Intel Wired LAN Driver Updates 2015-01-16 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=1421414946-22179-13-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gerlitz.or@gmail.com \
--cc=jogreene@redhat.com \
--cc=kamil.krawczyk@intel.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
--cc=shannon.nelson@intel.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