e1000: rename struct e1000_buffer to e1000_tx_buffer

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / e1000 / e1000.h

diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
index 10a0f221b18324a76aac7d9db316642bb8bef43b..4c2a1021aea3de71a42f00469592cf4bf79112ea 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000.h
+++ b/drivers/net/ethernet/intel/e1000/e1000.h
@@ -148,16 +148,21 @@ struct e1000_adapter;
 /* wrapper around a pointer to a socket buffer,
  * so a DMA handle can be stored along with the buffer
  */
-struct e1000_buffer {
+struct e1000_tx_buffer {
        struct sk_buff *skb;
        dma_addr_t dma;
-       struct page *page;
        unsigned long time_stamp;
        u16 length;
        u16 next_to_watch;
-       unsigned int segs;
+       bool mapped_as_page;
+       unsigned short segs;
        unsigned int bytecount;
-       u16 mapped_as_page;
+};
+
+struct e1000_rx_buffer {
+       struct sk_buff *skb;
+       dma_addr_t dma;
+       struct page *page;
 };
 
 struct e1000_tx_ring {
@@ -174,7 +179,7 @@ struct e1000_tx_ring {
        /* next descriptor to check for DD status bit */
        unsigned int next_to_clean;
        /* array of buffer information structs */
-       struct e1000_buffer *buffer_info;
+       struct e1000_tx_buffer *buffer_info;
 
        u16 tdh;
        u16 tdt;
@@ -195,7 +200,7 @@ struct e1000_rx_ring {
        /* next descriptor to check for DD status bit */
        unsigned int next_to_clean;
        /* array of buffer information structs */
-       struct e1000_buffer *buffer_info;
+       struct e1000_rx_buffer *buffer_info;
        struct sk_buff *rx_skb_top;
 
        /* cpu for rx queue */