From f1d1693d6fa36b5efefbe6d18c6a067089000284 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 1 Dec 2011 21:59:07 -0500 Subject: [PATCH] --- yaml --- r: 278323 b: refs/heads/master c: 63ec3c83e7ba6f23227d3ff69c5792911266bd75 h: refs/heads/master i: 278321: 16b1f299f8f734a82ce86fc0e17312372fa8fa33 278319: bac4b761d9030b6672583b06c411bf23bcd10e5e v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/niu.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ead151a9ecf..a9639b90e130 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d984e6197ecd2babc1537f42dc1e676133005cda +refs/heads/master: 63ec3c83e7ba6f23227d3ff69c5792911266bd75 diff --git a/trunk/drivers/net/ethernet/sun/niu.c b/trunk/drivers/net/ethernet/sun/niu.c index 680b107fdabd..56d106e58088 100644 --- a/trunk/drivers/net/ethernet/sun/niu.c +++ b/trunk/drivers/net/ethernet/sun/niu.c @@ -8579,9 +8579,11 @@ static int __devinit phy_record(struct niu_parent *parent, if (dev_id_1 < 0 || dev_id_2 < 0) return 0; if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) { + /* Becuase of the NIU_PHY_ID_MASK being applied, the 8704 + * test covers the 8706 as well. + */ if (((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) && - ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011) && - ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8706)) + ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011)) return 0; } else { if ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM5464R)