Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[karo-tx-linux.git] / drivers / net / benet / be.h

diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 63d593d53153d78fb7038022bbf0c8ece044ba4a..c49ddd08b2aa05a4634f93388c4aa9154552f989 100644 (file)
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -100,9 +100,9 @@ struct be_drvr_stats {
        u32 be_tx_wrbs;         /* number of tx WRBs used */
        u32 be_tx_events;       /* number of tx completion events  */
        u32 be_tx_compl;        /* number of tx completion entries processed */
-       u64 be_tx_jiffies;
-       ulong be_tx_bytes;
-       ulong be_tx_bytes_prev;
+       ulong be_tx_jiffies;
+       u64 be_tx_bytes;
+       u64 be_tx_bytes_prev;
        u32 be_tx_rate;
 
        u32 cache_barrier[16];
@@ -113,9 +113,9 @@ struct be_drvr_stats {
        u32 be_rx_compl;        /* number of rx completion entries processed */
        u32 be_lro_hgram_data[8];       /* histogram of LRO data packets */
        u32 be_lro_hgram_ack[8];        /* histogram of LRO ACKs */
-       u64 be_rx_jiffies;
-       ulong be_rx_bytes;
-       ulong be_rx_bytes_prev;
+       ulong be_rx_jiffies;
+       u64 be_rx_bytes;
+       u64 be_rx_bytes_prev;
        u32 be_rx_rate;
        /* number of non ether type II frames dropped where
         * frame len > length field of Mac Hdr */
@@ -194,6 +194,7 @@ struct be_adapter {
        struct be_eq_obj rx_eq;
        struct be_rx_obj rx_obj;
        u32 big_page_size;      /* Compounded page size shared by rx wrbs */
+       bool rx_post_starved;   /* Zero rx frags have been posted to BE */
 
        struct vlan_group *vlan_grp;
        u16 num_vlans;