diff options
| author |   Iyappan Subramanian <isubramanian@apm.com> | 2014-10-13 17:05:33 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-10-14 16:09:21 -0400 |
| commit | dc8385f0c0f46ca18c1c8ab59c9f565dc7cfa6bf (patch) | |
| tree | 2c5b4cbff124612a69b1f8ce2b5793fea0a00495 /drivers/net/ethernet/apm/xgene/xgene_enet_main.h | |
| parent | dtb: Add SGMII based 1GbE node to APM X-Gene SoC device tree (diff) | |
| download | linux-dev-dc8385f0c0f46ca18c1c8ab59c9f565dc7cfa6bf.tar.xz linux-dev-dc8385f0c0f46ca18c1c8ab59c9f565dc7cfa6bf.zip | |
drivers: net: xgene: Preparing for adding SGMII based 1GbE
- Added link_state function pointer to the xgene__mac_ops structure
- Moved ring manager (pdata->rm) assignment to xgene_enet_setup_ops
- Removed unused variable (pdata->phy_addr) and macro (FULL_DUPLEX)
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h index 86cf68b65584..10b03a1f16e9 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h @@ -76,6 +76,7 @@ struct xgene_mac_ops { void (*tx_disable)(struct xgene_enet_pdata *pdata); void (*rx_disable)(struct xgene_enet_pdata *pdata); void (*set_mac_addr)(struct xgene_enet_pdata *pdata); + void (*link_state)(struct work_struct *work); }; struct xgene_port_ops { @@ -109,7 +110,6 @@ struct xgene_enet_pdata { void __iomem *base_addr; void __iomem *ring_csr_addr; void __iomem *ring_cmd_addr; - u32 phy_addr; int phy_mode; enum xgene_enet_rm rm; struct rtnl_link_stats64 stats; |