diff options
author | Dhananjay Phadke <dhananjay@netxen.com> | 2008-08-01 06:14:55 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 02:11:07 -0400 |
commit | 24a7a45511f89959b4f1dc60a66260d09777901a (patch) | |
tree | ef48a3f9c6f65ba98f047b38937f71baef4a95ed /drivers/net/netxen/netxen_nic_niu.c | |
parent | 4ad7a018cf4ac3cbad661c28c0f783ee0a6e3bf6 (diff) |
netxen: fix link status, link speed
For NX3031, the phy is managed by firmware, so driver should avoid
setting any phy registers.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_niu.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_niu.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c index 4cb8f4a1cf4b..c9493e2df200 100644 --- a/drivers/net/netxen/netxen_nic_niu.c +++ b/drivers/net/netxen/netxen_nic_niu.c | |||
@@ -610,6 +610,9 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter, | |||
610 | int i; | 610 | int i; |
611 | DECLARE_MAC_BUF(mac); | 611 | DECLARE_MAC_BUF(mac); |
612 | 612 | ||
613 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) | ||
614 | return 0; | ||
615 | |||
613 | for (i = 0; i < 10; i++) { | 616 | for (i = 0; i < 10; i++) { |
614 | temp[0] = temp[1] = 0; | 617 | temp[0] = temp[1] = 0; |
615 | memcpy(temp + 2, addr, 2); | 618 | memcpy(temp + 2, addr, 2); |
@@ -727,6 +730,9 @@ int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter) | |||
727 | __u32 mac_cfg0; | 730 | __u32 mac_cfg0; |
728 | u32 port = adapter->physical_port; | 731 | u32 port = adapter->physical_port; |
729 | 732 | ||
733 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) | ||
734 | return 0; | ||
735 | |||
730 | if (port > NETXEN_NIU_MAX_GBE_PORTS) | 736 | if (port > NETXEN_NIU_MAX_GBE_PORTS) |
731 | return -EINVAL; | 737 | return -EINVAL; |
732 | mac_cfg0 = 0; | 738 | mac_cfg0 = 0; |
@@ -743,6 +749,9 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter) | |||
743 | __u32 mac_cfg; | 749 | __u32 mac_cfg; |
744 | u32 port = adapter->physical_port; | 750 | u32 port = adapter->physical_port; |
745 | 751 | ||
752 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) | ||
753 | return 0; | ||
754 | |||
746 | if (port > NETXEN_NIU_MAX_XG_PORTS) | 755 | if (port > NETXEN_NIU_MAX_XG_PORTS) |
747 | return -EINVAL; | 756 | return -EINVAL; |
748 | 757 | ||
@@ -819,6 +828,9 @@ int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter, | |||
819 | u8 temp[4]; | 828 | u8 temp[4]; |
820 | u32 val; | 829 | u32 val; |
821 | 830 | ||
831 | if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) | ||
832 | return 0; | ||
833 | |||
822 | if ((phy < 0) || (phy > NETXEN_NIU_MAX_XG_PORTS)) | 834 | if ((phy < 0) || (phy > NETXEN_NIU_MAX_XG_PORTS)) |
823 | return -EIO; | 835 | return -EIO; |
824 | 836 | ||