cxgb4vf: Fix ethtool get_settings for VF driver

[deliverable/linux.git] / drivers / net / ethernet / chelsio / cxgb4vf / adapter.h

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
index 3d06e77d7121510e70c846c5d9a6c0e7526aa736..6049f70e110c5701d0a6cb8685b3dbf2a78ab38d 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
@@ -96,6 +96,9 @@ struct port_info {
        s16 xact_addr_filt;             /* index of our MAC address filter */
        u16 rss_size;                   /* size of VI's RSS table slice */
        u8 pidx;                        /* index into adapter port[] */
+       s8 mdio_addr;
+       u8 port_type;                   /* firmware port type */
+       u8 mod_type;                    /* firmware module type */
        u8 port_id;                     /* physical port ID */
        u8 nqsets;                      /* # of "Queue Sets" */
        u8 first_qset;                  /* index of first "Queue Set" */
@@ -138,6 +141,8 @@ struct sge_fl {
        struct rx_sw_desc *sdesc;       /* address of SW RX descriptor ring */
        __be64 *desc;                   /* address of HW RX descriptor ring */
        dma_addr_t addr;                /* PCI bus address of hardware ring */
+       void __iomem *bar2_addr;        /* address of BAR2 Queue registers */
+       unsigned int bar2_qid;          /* Queue ID for BAR2 Queue registers */
 };
 
 /*
@@ -178,6 +183,8 @@ struct sge_rspq {
        u16 abs_id;                     /* SGE abs QID for the response Q */
        __be64 *desc;                   /* address of hardware response ring */
        dma_addr_t phys_addr;           /* PCI bus address of ring */
+       void __iomem *bar2_addr;        /* address of BAR2 Queue registers */
+       unsigned int bar2_qid;          /* Queue ID for BAR2 Queue registers */
        unsigned int iqe_len;           /* entry size */
        unsigned int size;              /* capcity of response Q */
        struct adapter *adapter;        /* our adapter */
@@ -240,6 +247,8 @@ struct sge_txq {
        struct tx_sw_desc *sdesc;       /* address of SW TX descriptor ring */
        struct sge_qstat *stat;         /* queue status entry */
        dma_addr_t phys_addr;           /* PCI bus address of hardware ring */
+       void __iomem *bar2_addr;        /* address of BAR2 Queue registers */
+       unsigned int bar2_qid;          /* Queue ID for BAR2 Queue registers */
 };
 
 /*
@@ -345,6 +354,7 @@ struct sge {
 struct adapter {
        /* PCI resources */
        void __iomem *regs;
+       void __iomem *bar2;
        struct pci_dev *pdev;
        struct device *pdev_dev;
 
@@ -515,6 +525,7 @@ static inline struct adapter *netdev2adap(const struct net_device *dev)
  * is "contracted" to provide for the common code.
  */
 void t4vf_os_link_changed(struct adapter *, int, int);
+void t4vf_os_portmod_changed(struct adapter *, int);
 
 /*
  * SGE function prototype declarations.