diff options
Diffstat (limited to 'drivers/net/pci-skeleton.c')
-rw-r--r-- | drivers/net/pci-skeleton.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 0c44b48f1384..480af402affd 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -1225,8 +1225,8 @@ static void netdrv_timer (unsigned long data) | |||
1225 | mii_lpa = mdio_read (dev, tp->phys[0], MII_LPA); | 1225 | mii_lpa = mdio_read (dev, tp->phys[0], MII_LPA); |
1226 | 1226 | ||
1227 | if (!tp->duplex_lock && mii_lpa != 0xffff) { | 1227 | if (!tp->duplex_lock && mii_lpa != 0xffff) { |
1228 | int duplex = (mii_lpa & LPA_100FULL) | 1228 | int duplex = ((mii_lpa & LPA_100FULL) || |
1229 | || (mii_lpa & 0x01C0) == 0x0040; | 1229 | (mii_lpa & 0x01C0) == 0x0040); |
1230 | if (tp->full_duplex != duplex) { | 1230 | if (tp->full_duplex != duplex) { |
1231 | tp->full_duplex = duplex; | 1231 | tp->full_duplex = duplex; |
1232 | printk (KERN_INFO | 1232 | printk (KERN_INFO |
@@ -1612,8 +1612,8 @@ static void netdrv_weird_interrupt (struct net_device *dev, | |||
1612 | (tp->drv_flags & HAS_LNK_CHNG)) { | 1612 | (tp->drv_flags & HAS_LNK_CHNG)) { |
1613 | /* Really link-change on new chips. */ | 1613 | /* Really link-change on new chips. */ |
1614 | int lpar = NETDRV_R16 (NWayLPAR); | 1614 | int lpar = NETDRV_R16 (NWayLPAR); |
1615 | int duplex = (lpar & 0x0100) || (lpar & 0x01C0) == 0x0040 | 1615 | int duplex = ((lpar & 0x0100) || (lpar & 0x01C0) == 0x0040 || |
1616 | || tp->duplex_lock; | 1616 | tp->duplex_lock); |
1617 | if (tp->full_duplex != duplex) { | 1617 | if (tp->full_duplex != duplex) { |
1618 | tp->full_duplex = duplex; | 1618 | tp->full_duplex = duplex; |
1619 | NETDRV_W8 (Cfg9346, Cfg9346_Unlock); | 1619 | NETDRV_W8 (Cfg9346, Cfg9346_Unlock); |
@@ -1820,8 +1820,8 @@ static void netdrv_set_rx_mode (struct net_device *dev) | |||
1820 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | | 1820 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | |
1821 | AcceptAllPhys; | 1821 | AcceptAllPhys; |
1822 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 1822 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
1823 | } else if ((dev->mc_count > multicast_filter_limit) | 1823 | } else if ((dev->mc_count > multicast_filter_limit) || |
1824 | || (dev->flags & IFF_ALLMULTI)) { | 1824 | (dev->flags & IFF_ALLMULTI)) { |
1825 | /* Too many to filter perfectly -- accept all multicasts. */ | 1825 | /* Too many to filter perfectly -- accept all multicasts. */ |
1826 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1826 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
1827 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 1827 | mc_filter[1] = mc_filter[0] = 0xffffffff; |