Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / ixgbe / ixgbe_fcoe.h

diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
index 5a650a4..99de145 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ixgbe/ixgbe_fcoe.h
@@ -62,20 +62,20 @@ struct ixgbe_fcoe_ddp {
        struct scatterlist *sgl;
        dma_addr_t udp;
        u64 *udl;
+       struct pci_pool *pool;
 };
 
 struct ixgbe_fcoe {
-#ifdef CONFIG_IXGBE_DCB
-       u8 tc;
-       u8 up;
-#endif
-       unsigned long mode;
+       struct pci_pool **pool;
        atomic_t refcnt;
        spinlock_t lock;
-       struct pci_pool *pool;
        struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];
        unsigned char *extra_ddp_buffer;
        dma_addr_t extra_ddp_buffer_dma;
+       unsigned long mode;
+#ifdef CONFIG_IXGBE_DCB
+       u8 up;
+#endif
 };
 
 #endif /* _IXGBE_FCOE_H */