diff options
| author | Joachim Eastwood <manabian@gmail.com> | 2012-10-18 11:01:14 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-19 13:18:29 -0400 |
| commit | 5e32353d318835a76f0bb61fd62271c30a43ee22 (patch) | |
| tree | dc2573e7653a84102266763d796615d9b9bbd472 /drivers/net/ethernet/cadence/macb.h | |
| parent | 0112a1dac5e8e4164ed7ab0b919f47b4d4854249 (diff) | |
net/at91_ether: use ethtool and mdio from macb
This rips out the at91_ether phy handling and ethtool stuff
and replace it with equivalent stuff from macb.
The only thing lost is the phy irq support from at91_ether,
but this can be added to macb and then benefit all users.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb.h')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 335d1119774..fd2961a4fca 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -555,17 +555,10 @@ struct macb { phy_interface_t phy_interface; /* at91_private */ - struct mii_if_info mii; /* ethtool support */ struct macb_platform_data board_data; /* board-specific * configuration (shared with * macb for common data */ - /* PHY */ - unsigned long phy_type; /* type of PHY (PHY_ID) */ - short phy_media; /* media interface type */ - unsigned short phy_address; /* 5-bit MDI address of PHY (0..31) */ - struct timer_list check_timer; /* Poll link status */ - /* Transmit */ struct sk_buff *skb; /* holds skb until xmit interrupt completes */ dma_addr_t skb_physaddr; /* phys addr from pci_map_single */ |