diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb.h')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index b71d1863e551..77793a9debcc 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h | |||
@@ -135,7 +135,6 @@ struct vf_data_storage { | |||
135 | #define IGB_TX_FLAGS_TSO 0x00000004 | 135 | #define IGB_TX_FLAGS_TSO 0x00000004 |
136 | #define IGB_TX_FLAGS_IPV4 0x00000008 | 136 | #define IGB_TX_FLAGS_IPV4 0x00000008 |
137 | #define IGB_TX_FLAGS_TSTAMP 0x00000010 | 137 | #define IGB_TX_FLAGS_TSTAMP 0x00000010 |
138 | #define IGB_TX_FLAGS_MAPPED_AS_PAGE 0x00000020 | ||
139 | #define IGB_TX_FLAGS_VLAN_MASK 0xffff0000 | 138 | #define IGB_TX_FLAGS_VLAN_MASK 0xffff0000 |
140 | #define IGB_TX_FLAGS_VLAN_SHIFT 16 | 139 | #define IGB_TX_FLAGS_VLAN_SHIFT 16 |
141 | 140 | ||
@@ -144,13 +143,12 @@ struct vf_data_storage { | |||
144 | struct igb_tx_buffer { | 143 | struct igb_tx_buffer { |
145 | union e1000_adv_tx_desc *next_to_watch; | 144 | union e1000_adv_tx_desc *next_to_watch; |
146 | unsigned long time_stamp; | 145 | unsigned long time_stamp; |
147 | dma_addr_t dma; | ||
148 | u32 length; | ||
149 | u32 tx_flags; | ||
150 | struct sk_buff *skb; | 146 | struct sk_buff *skb; |
151 | unsigned int bytecount; | 147 | unsigned int bytecount; |
152 | u16 gso_segs; | 148 | u16 gso_segs; |
153 | u8 mapped_as_page; | 149 | dma_addr_t dma; |
150 | u32 length; | ||
151 | u32 tx_flags; | ||
154 | }; | 152 | }; |
155 | 153 | ||
156 | struct igb_rx_buffer { | 154 | struct igb_rx_buffer { |