From d94e62ded454260ee3797a43d36f2d07adba8015 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 16 Mar 2011 18:41:47 +0000 Subject: [PATCH] [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 Tested-by: Ralph Giles Signed-off-by: Michael Brown --- src/drivers/net/igbvf/igbvf.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/drivers/net/igbvf/igbvf.h b/src/drivers/net/igbvf/igbvf.h index 3d2a0908..74f99c61 100644 --- a/src/drivers/net/igbvf/igbvf.h +++ b/src/drivers/net/igbvf/igbvf.h @@ -102,6 +102,7 @@ struct igbvf_queue_stats { * so a DMA handle can be stored along with the buffer */ struct igbvf_buffer { +#if 0 dma_addr_t dma; dma_addr_t page_dma; struct sk_buff *skb; @@ -119,9 +120,11 @@ struct igbvf_buffer { }; }; struct page *page; +#endif }; struct igbvf_ring { +#if 0 struct igbvf_adapter *adapter; /* backlink */ void *desc; /* pointer to ring memory */ dma_addr_t dma; /* phys address of ring */ @@ -136,11 +139,9 @@ struct igbvf_ring { /* array of buffer information structs */ struct igbvf_buffer *buffer_info; -#if 0 struct napi_struct napi; char name[IFNAMSIZ + 5]; -#endif u32 eims_value; u32 itr_val; u16 itr_register; @@ -149,6 +150,7 @@ struct igbvf_ring { struct sk_buff *rx_skb_top; struct igbvf_queue_stats stats; +#endif }; /* board specific private data structure */