Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / e1000e / e1000.h

diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index c1e7f94..638d175 100644 (file)
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -199,11 +199,6 @@ enum e1000_boards {
        board_pch2lan,
 };
 
-struct e1000_queue_stats {
-       u64 packets;
-       u64 bytes;
-};
-
 struct e1000_ps_page {
        struct page *page;
        u64 dma; /* must be u64 - written to hw */
@@ -257,8 +252,6 @@ struct e1000_ring {
        int set_itr;
 
        struct sk_buff *rx_skb_top;
-
-       struct e1000_queue_stats stats;
 };
 
 /* PHY register snapshot values */
@@ -341,7 +334,7 @@ struct e1000_adapter {
                          int *work_done, int work_to_do)
                                                ____cacheline_aligned_in_smp;
        void (*alloc_rx_buf) (struct e1000_adapter *adapter,
-                             int cleaned_count);
+                             int cleaned_count, gfp_t gfp);
        struct e1000_ring *rx_ring;
 
        u32 rx_int_delay;