path: root/sys/dev/ixl/ixl.h
diff options
authorEric Joyner <erj@FreeBSD.org>2016-05-12 18:21:17 +0000
committerEric Joyner <erj@FreeBSD.org>2016-05-12 18:21:17 +0000
commit1d767a8eae87497c53037a6e470505ce1061592c (patch)
treebf823cb70298f5f24358e25f8f05f1d47809ffec /sys/dev/ixl/ixl.h
parent95bb05043997aa0b42a745ddabf839a9b883ebed (diff)
ixl: Update to 1.4.17-k.
Changes: Kiran Patil i40e-shared: APIs to Add/remove port mirroring rules Shannon Nelson i40e-shared: add VEB stat control and remove L2 cloud filter Eric Joyner ixl: Update NVM version information shown. Eric Joyner ixl: Remove empty else block. Eric Joyner ixl: Slightly re-work ixl_init_msix(). Eric Joyner ixl: Remove duplicate queue enablement. Shannon Nelson i40e-shared: implement the API function for aq_set_switch_config Eric Joyner ixl: Update nvm version string shown in sysctl. Eric Joyner ixl/ixlv: Changes to PF/VF minor version checking/handling. Eric Joyner ixlv: Reduce maximum wait time for responses to VF AQ messages. Eric Joyner ixl/ixlv: Edit comments, comment out code, and edit spacing. Eric Joyner ixl: Print log message when SR-IOV init is successful. Eric Joyner ixl: Add Tx Flow Control filter from main PF VSI. Eric Joyner ixlv: Add extra error message when ixlv_get_vf_config times out. Eric Joyner ixl: Assign current MOCS optics the XLPPI media type. Eric Joyner ixl: Remove conditional wait after link status event. Eric Joyner ixl: Add line break and remove extraneous return statement. Eric Joyner ixl: Allow 40G speeds in the advertise_speed sysctl. Eric Joyner ixl: Add "CRC enable" field to link_status sysctl output. Eric Joyner ixl: Move sbuf.h include out of IXL_DEBUG* defines. Eric Joyner ixl: Move remaining debug sysctl funcs to IXL_DEBUG_SYSCTL define. Eric Joyner ixl: Add cases for all remaining media types in shared code to media_status(). Differential Revision: https://reviews.freebsd.org/D6211 Reviewed by: sbruno, kmacy, jeffrey.e.pieper@intel.com MFC after: 2 weeks Sponsored by: Intel Corporation
Notes: svn path=/head/; revision=299552
Diffstat (limited to 'sys/dev/ixl/ixl.h')
1 files changed, 6 insertions, 23 deletions
diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h
index b28c8523e934..34ff88071fcf 100644
--- a/sys/dev/ixl/ixl.h
+++ b/sys/dev/ixl/ixl.h
@@ -88,6 +88,7 @@
#include <sys/taskqueue.h>
#include <sys/pcpu.h>
#include <sys/smp.h>
+#include <sys/sbuf.h>
#include <machine/smp.h>
#ifdef PCI_IOV
@@ -100,8 +101,6 @@
#include "i40e_prototype.h"
#if defined(IXL_DEBUG) || defined(IXL_DEBUG_SYSCTL)
-#include <sys/sbuf.h>
#define MAC_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x"
#define MAC_FORMAT_ARGS(mac_addr) \
(mac_addr)[0], (mac_addr)[1], (mac_addr)[2], (mac_addr)[3], \
@@ -336,6 +335,11 @@
#define IXL_SET_NOPROTO(vsi, count) (vsi)->noproto = (count)
+/* Pre-10.2 media type compatibility */
+#if __FreeBSD_version < 1002000
* vendor_info_array
@@ -380,7 +384,6 @@ struct ixl_mac_filter {
u16 flags;
* The Transmit ring control struct
@@ -606,26 +609,6 @@ struct ixl_sysctl_info {
extern int ixl_atr_rate;
-** ixl_fw_version_str - format the FW and NVM version strings
-static inline char *
-ixl_fw_version_str(struct i40e_hw *hw)
- static char buf[32];
- snprintf(buf, sizeof(buf),
- "f%d.%d a%d.%d n%02x.%02x e%08x",
- hw->aq.fw_maj_ver, hw->aq.fw_min_ver,
- hw->aq.api_maj_ver, hw->aq.api_min_ver,
- (hw->nvm.version & IXL_NVM_VERSION_HI_MASK) >>
- (hw->nvm.version & IXL_NVM_VERSION_LO_MASK) >>
- hw->nvm.eetrack);
- return buf;
* TXRX Function prototypes