Browse Source

[igbvf] Remove some unused Linux-specific portions of igbvf.h

These unused portions trigger a compiler warning under gcc 4.6, due to
the ambiguity over the "page" field in struct igbvf_buffer.

Reported-by: Ralph Giles <giles@thaumas.net>
Tested-by: Ralph Giles <giles@thaumas.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 13 years ago
parent
commit
d94e62ded4
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      src/drivers/net/igbvf/igbvf.h

+ 4
- 2
src/drivers/net/igbvf/igbvf.h View File

@@ -102,6 +102,7 @@ struct igbvf_queue_stats {
102 102
  * so a DMA handle can be stored along with the buffer
103 103
  */
104 104
 struct igbvf_buffer {
105
+#if 0
105 106
 	dma_addr_t dma;
106 107
 	dma_addr_t page_dma;
107 108
 	struct sk_buff *skb;
@@ -119,9 +120,11 @@ struct igbvf_buffer {
119 120
 		};
120 121
 	};
121 122
 	struct page *page;
123
+#endif
122 124
 };
123 125
 
124 126
 struct igbvf_ring {
127
+#if 0
125 128
 	struct igbvf_adapter *adapter;  /* backlink */
126 129
 	void *desc;			/* pointer to ring memory  */
127 130
 	dma_addr_t dma;			/* phys address of ring    */
@@ -136,11 +139,9 @@ struct igbvf_ring {
136 139
 
137 140
 	/* array of buffer information structs */
138 141
 	struct igbvf_buffer *buffer_info;
139
-#if 0
140 142
 	struct napi_struct napi;
141 143
 
142 144
 	char name[IFNAMSIZ + 5];
143
-#endif
144 145
 	u32 eims_value;
145 146
 	u32 itr_val;
146 147
 	u16 itr_register;
@@ -149,6 +150,7 @@ struct igbvf_ring {
149 150
 	struct sk_buff *rx_skb_top;
150 151
 
151 152
 	struct igbvf_queue_stats stats;
153
+#endif
152 154
 };
153 155
 
154 156
 /* board specific private data structure */

Loading…
Cancel
Save