diff options
author | Olof Johansson <olof@lixom.net> | 2007-05-08 01:47:54 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-05-08 01:48:19 -0400 |
commit | bb6e9590792834f905a92e439a083254649c985c (patch) | |
tree | dd071254f52dbcef0373d1a9346276bd58be2adf /drivers/net/pasemi_mac.h | |
parent | ceb51361370c003e13f782edb7171a8383e5c849 (diff) |
pasemi_mac: PHY support
PHY support for pasemi_mac.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/pasemi_mac.h')
-rw-r--r-- | drivers/net/pasemi_mac.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/pasemi_mac.h index 6539de1c2f23..8bc0cea8b145 100644 --- a/drivers/net/pasemi_mac.h +++ b/drivers/net/pasemi_mac.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/ethtool.h> | 24 | #include <linux/ethtool.h> |
25 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
27 | #include <linux/phy.h> | ||
27 | 28 | ||
28 | struct pasemi_mac_txring { | 29 | struct pasemi_mac_txring { |
29 | spinlock_t lock; | 30 | spinlock_t lock; |
@@ -54,6 +55,7 @@ struct pasemi_mac { | |||
54 | struct pci_dev *pdev; | 55 | struct pci_dev *pdev; |
55 | struct pci_dev *dma_pdev; | 56 | struct pci_dev *dma_pdev; |
56 | struct pci_dev *iob_pdev; | 57 | struct pci_dev *iob_pdev; |
58 | struct phy_device *phydev; | ||
57 | struct net_device_stats stats; | 59 | struct net_device_stats stats; |
58 | 60 | ||
59 | /* Pointer to the cacheable per-channel status registers */ | 61 | /* Pointer to the cacheable per-channel status registers */ |
@@ -75,8 +77,12 @@ struct pasemi_mac { | |||
75 | struct pasemi_mac_rxring *rx; | 77 | struct pasemi_mac_rxring *rx; |
76 | unsigned long tx_irq; | 78 | unsigned long tx_irq; |
77 | unsigned long rx_irq; | 79 | unsigned long rx_irq; |
80 | int link; | ||
81 | int speed; | ||
82 | int duplex; | ||
78 | 83 | ||
79 | unsigned int msg_enable; | 84 | unsigned int msg_enable; |
85 | char phy_id[BUS_ID_SIZE]; | ||
80 | }; | 86 | }; |
81 | 87 | ||
82 | /* Software status descriptor (desc_info) */ | 88 | /* Software status descriptor (desc_info) */ |