diff options
| author |   Iyappan Subramanian <isubramanian@apm.com> | 2014-10-09 18:32:06 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-10-10 15:06:59 -0400 |
| commit | 0148d38d36b76b190ddddff68f02d2617ada3bcb (patch) | |
| tree | 60494350a62b209bb07f41322e8fea5aa3da134e /drivers/net/ethernet/apm/xgene/xgene_enet_main.h | |
| parent | drivers: net: xgene: Preparing for adding 10GbE support (diff) | |
| download | linux-dev-0148d38d36b76b190ddddff68f02d2617ada3bcb.tar.xz linux-dev-0148d38d36b76b190ddddff68f02d2617ada3bcb.zip | |
drivers: net: xgene: Add 10GbE support
- Added 10GbE support
- Removed unused macros/variables
- Moved mac_init call to the end of hardware init
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apm/xgene/xgene_enet_main.h')
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h index ac180f980fcd..86cf68b65584 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h @@ -105,18 +105,17 @@ struct xgene_enet_pdata { void __iomem *eth_ring_if_addr; void __iomem *eth_diag_csr_addr; void __iomem *mcx_mac_addr; - void __iomem *mcx_stats_addr; void __iomem *mcx_mac_csr_addr; void __iomem *base_addr; void __iomem *ring_csr_addr; void __iomem *ring_cmd_addr; u32 phy_addr; int phy_mode; - u32 speed; - u16 rm; + enum xgene_enet_rm rm; struct rtnl_link_stats64 stats; struct xgene_mac_ops *mac_ops; struct xgene_port_ops *port_ops; + struct delayed_work link_work; }; /* Set the specified value into a bit-field defined by its starting position |