diff options
Diffstat (limited to 'drivers/net/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index ea38da6d31ff..322d16974000 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -1615,7 +1615,7 @@ static void do_cable_magic(struct net_device *dev) | |||
1615 | * (these values all come from National) | 1615 | * (these values all come from National) |
1616 | */ | 1616 | */ |
1617 | if (!(data & 0x80) || ((data >= 0xd8) && (data <= 0xff))) { | 1617 | if (!(data & 0x80) || ((data >= 0xd8) && (data <= 0xff))) { |
1618 | struct netdev_private *np = netdev_priv(dev); | 1618 | np = netdev_priv(dev); |
1619 | 1619 | ||
1620 | /* the bug has been triggered - fix the coefficient */ | 1620 | /* the bug has been triggered - fix the coefficient */ |
1621 | writew(TSTDAT_FIXED, ioaddr + TSTDAT); | 1621 | writew(TSTDAT_FIXED, ioaddr + TSTDAT); |
@@ -2502,8 +2502,8 @@ static void __set_rx_mode(struct net_device *dev) | |||
2502 | memset(mc_filter, 0, sizeof(mc_filter)); | 2502 | memset(mc_filter, 0, sizeof(mc_filter)); |
2503 | for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; | 2503 | for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; |
2504 | i++, mclist = mclist->next) { | 2504 | i++, mclist = mclist->next) { |
2505 | int i = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 23) & 0x1ff; | 2505 | int b = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 23) & 0x1ff; |
2506 | mc_filter[i/8] |= (1 << (i & 0x07)); | 2506 | mc_filter[b/8] |= (1 << (b & 0x07)); |
2507 | } | 2507 | } |
2508 | rx_mode = RxFilterEnable | AcceptBroadcast | 2508 | rx_mode = RxFilterEnable | AcceptBroadcast |
2509 | | AcceptMulticast | AcceptMyPhys; | 2509 | | AcceptMulticast | AcceptMyPhys; |