Please pull from 'from_linus' branch

Please pull from 'from_linus' branch

[Kumar Gala]

Please pull from 'for_linus' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for_linus

to receive the following updates:

 drivers/net/gianfar.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Kumar Gala (1):
      gianfar: Fix typo bug introduced by move to udp_hdr()

commit 8da32de5c845b711a500f89342baf10c662e2ecb
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Fri Jun 29 00:12:04 2007 -0500

    gianfar: Fix typo bug introduced by move to udp_hdr()

    In commit 4bedb45203eab92a87b4c863fe2d0cded633427f both the udp and tcp
    cases where changed to use udp_hdr() instead of leaving the tcp case
    alone and fixing with tcp_hdr().

    This ended up causing random behavior with TCP connections because
    of looking for tcp_hdr()->check in the wrong place.

    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6822bf1..1b854bf 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -944,7 +944,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
 		flags |= TXFCB_UDP;
 		fcb->phcs = udp_hdr(skb)->check;
 	} else
-		fcb->phcs = udp_hdr(skb)->check;
+		fcb->phcs = tcp_hdr(skb)->check;

 	/* l3os is the distance between the start of the
 	 * frame (skb->data) and the start of the IP hdr.

Re: Please pull from 'from_linus' branch

[Jeff Garzik]

Kumar Gala wrote:
> Please pull from 'for_linus' branch of
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for_linus
> 
> to receive the following updates:
> 
>  drivers/net/gianfar.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Kumar Gala (1):
>       gianfar: Fix typo bug introduced by move to udp_hdr()

Why is net driver stuff no longer going through me?

Fixes are regularly going upstream.

	Jeff

Re: Please pull from 'from_linus' branch

[Kumar Gala]

On Jun 29, 2007, at 6:06 AM, Jeff Garzik wrote:

> Kumar Gala wrote:
>> Please pull from 'for_linus' branch of
>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
>> for_linus
>> to receive the following updates:
>>  drivers/net/gianfar.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> Kumar Gala (1):
>>       gianfar: Fix typo bug introduced by move to udp_hdr()
>
> Why is net driver stuff no longer going through me?
>
> Fixes are regularly going upstream.

Sorry about that, will push stuff through you in the future.  I've  
sent Linus one off fixes in the past for post -rc issues.

- k

Re: Please pull from 'from_linus' branch

[Kumar Gala]

On Jun 29, 2007, at 6:06 AM, Jeff Garzik wrote:

> Kumar Gala wrote:
>> Please pull from 'for_linus' branch of
>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
>> for_linus
>> to receive the following updates:
>>  drivers/net/gianfar.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> Kumar Gala (1):
>>       gianfar: Fix typo bug introduced by move to udp_hdr()
>
> Why is net driver stuff no longer going through me?
>
> Fixes are regularly going upstream.

Jeff,

Can you either pull this in your upstream-fixes branch for Linus  
before 2.6.22 comes out.

- k

Re: Please pull from 'from_linus' branch

[Jeff Garzik]

Kumar Gala wrote:
> Please pull from 'for_linus' branch of
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for_linus
> 
> to receive the following updates:
> 
>  drivers/net/gianfar.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Kumar Gala (1):
>       gianfar: Fix typo bug introduced by move to udp_hdr()

pulled

Please pull from 'from_linus' branch

[Kumar Gala]

Please pull from 'for_linus' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for_linus

to receive the following updates:

 drivers/net/phy/mdio_bus.c |    3 ++-
 drivers/net/phy/vitesse.c  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Kumar Gala (1):
      phy: Fix phy_id for Vitesse 824x PHY

commit 5f708dd91d15876e26d7a57f97a255cedffca463
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Thu Jun 28 13:26:06 2007 -0500

    phy: Fix phy_id for Vitesse 824x PHY

    The phy_id specified for the Vitesse 824x PHY would never match because
    it was expecting bits to be set that would be masked by the phy_id_mask.
    Fix the phy_id so it will match properly, and changed the mdio_bus_match
    to mask both the driver and devices phy_id with the mask so we dont have
    this issue in the future.

    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index fc4aee9..fc2f0e6 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -131,7 +131,8 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
 	struct phy_device *phydev = to_phy_device(dev);
 	struct phy_driver *phydrv = to_phy_driver(drv);

-	return (phydrv->phy_id == (phydev->phy_id & phydrv->phy_id_mask));
+	return ((phydrv->phy_id & phydrv->phy_id_mask) ==
+		(phydev->phy_id & phydrv->phy_id_mask));
 }

 /* Suspend and resume.  Copied from platform_suspend and
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 792716b..596222b 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -84,7 +84,7 @@ static int vsc824x_config_intr(struct phy_device *phydev)

 /* Vitesse 824x */
 static struct phy_driver vsc8244_driver = {
-	.phy_id		= 0x000fc6c2,
+	.phy_id		= 0x000fc6c0,
 	.name		= "Vitesse VSC8244",
 	.phy_id_mask	= 0x000fffc0,
 	.features	= PHY_GBIT_FEATURES,