From: Andrew Morton Cc: Steffen Klassert Signed-off-by: Andrew Morton --- drivers/net/3c59x.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff -puN drivers/net/3c59x.c~3c59x-use-mii_check_media-tidy drivers/net/3c59x.c --- devel/drivers/net/3c59x.c~3c59x-use-mii_check_media-tidy 2006-03-11 17:43:47.000000000 -0800 +++ devel-akpm/drivers/net/3c59x.c 2006-03-11 17:43:47.000000000 -0800 @@ -1635,20 +1635,20 @@ vortex_set_duplex(struct net_device *dev EL3WINDOW(3); /* Set the full-duplex bit. */ - iowrite16( ((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) | + iowrite16(((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) | (vp->large_frames ? 0x40 : 0) | - ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? 0x100 : 0), + ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? + 0x100 : 0), ioaddr + Wn3_MAC_Ctrl); issue_and_wait(dev, TxReset); - /* - * * Don't reset the PHY - that upsets autonegotiation during DHCP operations. + /* + * Don't reset the PHY - that upsets autonegotiation during DHCP operations. */ - issue_and_wait(dev, RxReset|0x04); + issue_and_wait(dev, RxReset|0x04); } -static void -vortex_check_media(struct net_device *dev, unsigned int init) +static void vortex_check_media(struct net_device *dev, unsigned int init) { struct vortex_private *vp = netdev_priv(dev); unsigned int ok_to_print = 0; @@ -1659,8 +1659,9 @@ vortex_check_media(struct net_device *de if (mii_check_media(&vp->mii, ok_to_print, init)) { vp->full_duplex = vp->mii.full_duplex; vortex_set_duplex(dev); - } else if (init) + } else if (init) { vortex_set_duplex(dev); + } } static void _