Message ID | 20111201.220003.905428158537118068.davem@davemloft.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Friday, 2. December 2011 04:00:03 David Miller wrote: > diff --git a/drivers/net/ethernet/sun/niu.c > b/drivers/net/ethernet/sun/niu.c index 680b107..56d106e 100644 > --- a/drivers/net/ethernet/sun/niu.c > +++ b/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 The change looks good to me, just fix the typo in "Becuase". Thanks, Thomas -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Thomas Jarosch <thomas.jarosch@intra2net.com> Date: Fri, 2 Dec 2011 09:49:32 +0100 > On Friday, 2. December 2011 04:00:03 David Miller wrote: >> diff --git a/drivers/net/ethernet/sun/niu.c >> b/drivers/net/ethernet/sun/niu.c index 680b107..56d106e 100644 >> --- a/drivers/net/ethernet/sun/niu.c >> +++ b/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 > > The change looks good to me, just fix the typo in "Becuase". Fixed, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 680b107..56d106e 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/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)