X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fnet%2Fcs89x0.c;h=b0208e474f7eabaebebc646491e76747b378ba4b;hb=9d85929fefd040ca84a5e04ee704d043efcc3c2e;hp=0e79cef95c0a6fd14aaa60d0233c28ba2a2e6871;hpb=f6f223039c0d0683bdea1eabd35b309e10311a60;p=cascardo%2Flinux.git diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 0e79cef95c0a..b0208e474f7e 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c @@ -580,7 +580,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) } #ifdef CONFIG_SH_HICOSH4 - /* truely reset the chip */ + /* truly reset the chip */ writeword(ioaddr, ADD_PORT, 0x0114); writeword(ioaddr, DATA_PORT, 0x0040); #endif @@ -1785,7 +1785,7 @@ static void set_multicast_list(struct net_device *dev) { lp->rx_mode = RX_ALL_ACCEPT; } - else if((dev->flags&IFF_ALLMULTI)||dev->mc_list) + else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev)) { /* The multicast-accept list is initialized to accept-all, and we rely on higher-level filtering for now. */