diff options
| author | Eric Joyner <erj@FreeBSD.org> | 2016-05-12 18:18:55 +0000 |
|---|---|---|
| committer | Eric Joyner <erj@FreeBSD.org> | 2016-05-12 18:18:55 +0000 |
| commit | ac83ea833d494a651c3fa807c90675b724a78c19 (patch) | |
| tree | d5eab245e3761a8856554d0c9dcc805571cab5ca /sys/dev/ixl/ixl.h | |
| parent | 3934bc5561de24ea02938e73890c309e67ccac5f (diff) | |
| download | src-ac83ea833d494a651c3fa807c90675b724a78c19.tar.gz src-ac83ea833d494a651c3fa807c90675b724a78c19.zip | |
ixl: Update to 1.4.5-k.
This first update will revert some upstream changes; forthcoming updates will reinstate them.
Changes, by author:
Anjali Singhai Jain i40e-shared: Add WB_ON_ITR offload support
Shannon Nelson i40e-shared: fix phy_types bitmap type
Kevin Scott i40e-shared: Store off PHY capabilities
Shannon Nelson i40e-shared: fix byteswap of phy_type
Jingjing Wu i40e-shared: Fix compile issue related to const string
Greg Bowers i40e-shared: Add AQ defines for non-willing Apps (DCB)
Greg Bowers i40e-shared: Support for non-willing Apps (DCB)
Shannon Nelson i40e-shared: use upper-32 bit macro for address
Shannon Nelson i40e-shared: grab the AQ spinlocks before clearing registers
Eric Joyner ixl: Properly strip out X722_SUPPORT (temporarily).
Eric Joyner ixl: Allow Fort Pond devices to advertise 100M in set_advertise sysctl.
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
Notes:
svn path=/head/; revision=299545
Diffstat (limited to 'sys/dev/ixl/ixl.h')
| -rw-r--r-- | sys/dev/ixl/ixl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index 3348e1abae27..3ab27642d3e5 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -93,7 +93,6 @@ #ifdef PCI_IOV #include <sys/nv.h> #include <sys/iov_schema.h> -#include <dev/pci/pci_iov.h> #endif #include "i40e_type.h" @@ -498,6 +497,7 @@ struct ixl_vsi { struct device *dev; struct i40e_hw *hw; struct ifmedia media; + enum i40e_vsi_type type; u64 que_mask; int id; u16 vsi_num; @@ -512,9 +512,11 @@ struct ixl_vsi { u16 uplink_seid; u16 downlink_seid; u16 max_frame_size; + u16 rss_table_size; + u16 rss_size; /* MAC/VLAN Filter list */ - struct ixl_ftl_head ftl; + struct ixl_ftl_head ftl; u16 num_macs; struct i40e_aqc_vsi_properties_data info; |