Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / drivers / net / ethernet / cavium / thunder / nic.h

diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h
index 34e9acea87479db83b852c4e233c3e26b532a6a1..092f097a59432ee30e207d355031a722a682517a 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic.h
+++ b/drivers/net/ethernet/cavium/thunder/nic.h
@@ -257,10 +257,13 @@ struct nicvf_drv_stats {
        u64 rx_frames_jumbo;
        u64 rx_drops;
 
+       u64 rcv_buffer_alloc_failures;
+
        /* Tx */
        u64 tx_frames_ok;
        u64 tx_drops;
        u64 tx_tso;
+       u64 tx_timeout;
        u64 txq_stop;
        u64 txq_wake;
 };
@@ -315,6 +318,7 @@ struct nicvf {
        struct msix_entry       msix_entries[NIC_VF_MSIX_VECTORS];
        char                    irq_name[NIC_VF_MSIX_VECTORS][20];
        bool                    irq_allocated[NIC_VF_MSIX_VECTORS];
+       cpumask_var_t           affinity_mask[NIC_VF_MSIX_VECTORS];
 
        /* VF <-> PF mailbox communication */
        bool                    pf_acked;