Commit 01c1053d authored by Scott Feldman's avatar Scott Feldman Committed by Vojtech Pavlik

[PATCH] missing setup for National DP83840 PHY rev b/c

* Add National DP83840 PHY rev b/c setup.  Only rev a was being setup.
parent 772d610c
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
#define DRV_NAME "e100" #define DRV_NAME "e100"
#define DRV_VERSION "3.0.15" #define DRV_VERSION "3.0.16"
#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" #define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver"
#define DRV_COPYRIGHT "Copyright(c) 1999-2004 Intel Corporation" #define DRV_COPYRIGHT "Copyright(c) 1999-2004 Intel Corporation"
#define PFX DRV_NAME ": " #define PFX DRV_NAME ": "
...@@ -1032,8 +1032,9 @@ static int e100_phy_init(struct nic *nic) ...@@ -1032,8 +1032,9 @@ static int e100_phy_init(struct nic *nic)
nic->phy = (u32)id_hi << 16 | (u32)id_lo; nic->phy = (u32)id_hi << 16 | (u32)id_lo;
DPRINTK(HW, DEBUG, "phy ID = 0x%08X\n", nic->phy); DPRINTK(HW, DEBUG, "phy ID = 0x%08X\n", nic->phy);
/* Handle National tx phy */ /* Handle National tx phys */
if(nic->phy == phy_nsc_tx) { #define NCS_PHY_MODEL_MASK 0xFFF0FFFF
if((nic->phy & NCS_PHY_MODEL_MASK) == phy_nsc_tx) {
/* Disable congestion control */ /* Disable congestion control */
cong = mdio_read(netdev, nic->mii.phy_id, MII_NSC_CONG); cong = mdio_read(netdev, nic->mii.phy_id, MII_NSC_CONG);
cong |= NSC_CONG_TXREADY; cong |= NSC_CONG_TXREADY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment