Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sfc: Remove siena_nic_data and stats

These are no longer used, and the two Siena specific functions are
no longer present in sfc.ko.

Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Acked-by: Edward Cree <ecree.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Martin Habets and committed by
David S. Miller
e714e5b2 806521bc

-95
-95
drivers/net/ethernet/sfc/nic.h
··· 24 24 }; 25 25 26 26 enum { 27 - SIENA_STAT_tx_bytes = GENERIC_STAT_COUNT, 28 - SIENA_STAT_tx_good_bytes, 29 - SIENA_STAT_tx_bad_bytes, 30 - SIENA_STAT_tx_packets, 31 - SIENA_STAT_tx_bad, 32 - SIENA_STAT_tx_pause, 33 - SIENA_STAT_tx_control, 34 - SIENA_STAT_tx_unicast, 35 - SIENA_STAT_tx_multicast, 36 - SIENA_STAT_tx_broadcast, 37 - SIENA_STAT_tx_lt64, 38 - SIENA_STAT_tx_64, 39 - SIENA_STAT_tx_65_to_127, 40 - SIENA_STAT_tx_128_to_255, 41 - SIENA_STAT_tx_256_to_511, 42 - SIENA_STAT_tx_512_to_1023, 43 - SIENA_STAT_tx_1024_to_15xx, 44 - SIENA_STAT_tx_15xx_to_jumbo, 45 - SIENA_STAT_tx_gtjumbo, 46 - SIENA_STAT_tx_collision, 47 - SIENA_STAT_tx_single_collision, 48 - SIENA_STAT_tx_multiple_collision, 49 - SIENA_STAT_tx_excessive_collision, 50 - SIENA_STAT_tx_deferred, 51 - SIENA_STAT_tx_late_collision, 52 - SIENA_STAT_tx_excessive_deferred, 53 - SIENA_STAT_tx_non_tcpudp, 54 - SIENA_STAT_tx_mac_src_error, 55 - SIENA_STAT_tx_ip_src_error, 56 - SIENA_STAT_rx_bytes, 57 - SIENA_STAT_rx_good_bytes, 58 - SIENA_STAT_rx_bad_bytes, 59 - SIENA_STAT_rx_packets, 60 - SIENA_STAT_rx_good, 61 - SIENA_STAT_rx_bad, 62 - SIENA_STAT_rx_pause, 63 - SIENA_STAT_rx_control, 64 - SIENA_STAT_rx_unicast, 65 - SIENA_STAT_rx_multicast, 66 - SIENA_STAT_rx_broadcast, 67 - SIENA_STAT_rx_lt64, 68 - SIENA_STAT_rx_64, 69 - SIENA_STAT_rx_65_to_127, 70 - SIENA_STAT_rx_128_to_255, 71 - SIENA_STAT_rx_256_to_511, 72 - SIENA_STAT_rx_512_to_1023, 73 - SIENA_STAT_rx_1024_to_15xx, 74 - SIENA_STAT_rx_15xx_to_jumbo, 75 - SIENA_STAT_rx_gtjumbo, 76 - SIENA_STAT_rx_bad_gtjumbo, 77 - SIENA_STAT_rx_overflow, 78 - SIENA_STAT_rx_false_carrier, 79 - SIENA_STAT_rx_symbol_error, 80 - SIENA_STAT_rx_align_error, 81 - SIENA_STAT_rx_length_error, 82 - SIENA_STAT_rx_internal_error, 83 - SIENA_STAT_rx_nodesc_drop_cnt, 84 - SIENA_STAT_COUNT 85 - }; 86 - 87 - /** 88 - * struct siena_nic_data - Siena NIC state 89 - * @efx: Pointer back to main interface structure 90 - * @wol_filter_id: Wake-on-LAN packet filter id 91 - * @stats: Hardware statistics 92 - * @vf: Array of &struct siena_vf objects 93 - * @vf_buftbl_base: The zeroth buffer table index used to back VF queues. 94 - * @vfdi_status: Common VFDI status page to be dmad to VF address space. 95 - * @local_addr_list: List of local addresses. Protected by %local_lock. 96 - * @local_page_list: List of DMA addressable pages used to broadcast 97 - * %local_addr_list. Protected by %local_lock. 98 - * @local_lock: Mutex protecting %local_addr_list and %local_page_list. 99 - * @peer_work: Work item to broadcast peer addresses to VMs. 100 - */ 101 - struct siena_nic_data { 102 - struct efx_nic *efx; 103 - int wol_filter_id; 104 - u64 stats[SIENA_STAT_COUNT]; 105 - #ifdef CONFIG_SFC_SRIOV 106 - struct siena_vf *vf; 107 - struct efx_channel *vfdi_channel; 108 - unsigned vf_buftbl_base; 109 - struct efx_buffer vfdi_status; 110 - struct list_head local_addr_list; 111 - struct list_head local_page_list; 112 - struct mutex local_lock; 113 - struct work_struct peer_work; 114 - #endif 115 - }; 116 - 117 - enum { 118 27 EF10_STAT_port_tx_bytes = GENERIC_STAT_COUNT, 119 28 EF10_STAT_port_tx_packets, 120 29 EF10_STAT_port_tx_pause, ··· 210 301 211 302 extern const struct efx_nic_type efx_hunt_a0_nic_type; 212 303 extern const struct efx_nic_type efx_hunt_a0_vf_nic_type; 213 - 214 - /* Global Resources */ 215 - void siena_prepare_flush(struct efx_nic *efx); 216 - void siena_finish_flush(struct efx_nic *efx); 217 304 218 305 #endif /* EFX_NIC_H */