diff options
| author | Florian Westphal <fw@strlen.de> | 2014-09-03 13:34:31 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-09-12 02:00:13 -0700 |
| commit | 580f321d8498f1c7f83f2765601c84105a21e423 (patch) | |
| tree | 364d0b7ec7cda31e2db53cc11b91060062d2938e /drivers/net/ethernet/intel/e1000/e1000.h | |
| parent | 93f0afe9ce9cb095f1fcb23da8a5897f85d61275 (diff) | |
| download | linux-580f321d8498f1c7f83f2765601c84105a21e423.tar.bz2 | |
e1000: rename struct e1000_buffer to e1000_tx_buffer
and remove *page, its only used for Rx.
Signed-off-by: Florian Westphal <fw@strlen.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000.h')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h index 81efe3358350..4c2a1021aea3 100644 --- a/drivers/net/ethernet/intel/e1000/e1000.h +++ b/drivers/net/ethernet/intel/e1000/e1000.h @@ -148,16 +148,15 @@ 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 { @@ -180,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; |