diff options
Diffstat (limited to 'drivers/net/ethernet/sfc/net_driver.h')
-rw-r--r-- | drivers/net/ethernet/sfc/net_driver.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index 9ede32064685..325dd94bca46 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h | |||
@@ -913,13 +913,6 @@ struct vfdi_status; | |||
913 | * @vf_count: Number of VFs intended to be enabled. | 913 | * @vf_count: Number of VFs intended to be enabled. |
914 | * @vf_init_count: Number of VFs that have been fully initialised. | 914 | * @vf_init_count: Number of VFs that have been fully initialised. |
915 | * @vi_scale: log2 number of vnics per VF. | 915 | * @vi_scale: log2 number of vnics per VF. |
916 | * @vf_buftbl_base: The zeroth buffer table index used to back VF queues. | ||
917 | * @vfdi_status: Common VFDI status page to be dmad to VF address space. | ||
918 | * @local_addr_list: List of local addresses. Protected by %local_lock. | ||
919 | * @local_page_list: List of DMA addressable pages used to broadcast | ||
920 | * %local_addr_list. Protected by %local_lock. | ||
921 | * @local_lock: Mutex protecting %local_addr_list and %local_page_list. | ||
922 | * @peer_work: Work item to broadcast peer addresses to VMs. | ||
923 | * @ptp_data: PTP state data | 916 | * @ptp_data: PTP state data |
924 | * @vpd_sn: Serial number read from VPD | 917 | * @vpd_sn: Serial number read from VPD |
925 | * @monitor_work: Hardware monitor workitem | 918 | * @monitor_work: Hardware monitor workitem |
@@ -1060,17 +1053,10 @@ struct efx_nic { | |||
1060 | wait_queue_head_t flush_wq; | 1053 | wait_queue_head_t flush_wq; |
1061 | 1054 | ||
1062 | #ifdef CONFIG_SFC_SRIOV | 1055 | #ifdef CONFIG_SFC_SRIOV |
1063 | struct efx_channel *vfdi_channel; | ||
1064 | struct efx_vf *vf; | 1056 | struct efx_vf *vf; |
1065 | unsigned vf_count; | 1057 | unsigned vf_count; |
1066 | unsigned vf_init_count; | 1058 | unsigned vf_init_count; |
1067 | unsigned vi_scale; | 1059 | unsigned vi_scale; |
1068 | unsigned vf_buftbl_base; | ||
1069 | struct efx_buffer vfdi_status; | ||
1070 | struct list_head local_addr_list; | ||
1071 | struct list_head local_page_list; | ||
1072 | struct mutex local_lock; | ||
1073 | struct work_struct peer_work; | ||
1074 | #endif | 1060 | #endif |
1075 | 1061 | ||
1076 | struct efx_ptp_data *ptp_data; | 1062 | struct efx_ptp_data *ptp_data; |
@@ -1344,6 +1330,11 @@ struct efx_nic_type { | |||
1344 | int (*ptp_set_ts_sync_events)(struct efx_nic *efx, bool en, bool temp); | 1330 | int (*ptp_set_ts_sync_events)(struct efx_nic *efx, bool en, bool temp); |
1345 | int (*ptp_set_ts_config)(struct efx_nic *efx, | 1331 | int (*ptp_set_ts_config)(struct efx_nic *efx, |
1346 | struct hwtstamp_config *init); | 1332 | struct hwtstamp_config *init); |
1333 | int (*sriov_init)(struct efx_nic *efx); | ||
1334 | void (*sriov_fini)(struct efx_nic *efx); | ||
1335 | void (*sriov_mac_address_changed)(struct efx_nic *efx); | ||
1336 | bool (*sriov_wanted)(struct efx_nic *efx); | ||
1337 | void (*sriov_reset)(struct efx_nic *efx); | ||
1347 | 1338 | ||
1348 | int revision; | 1339 | int revision; |
1349 | unsigned int txd_ptr_tbl_base; | 1340 | unsigned int txd_ptr_tbl_base; |