diff options
Diffstat (limited to 'drivers/net/usb/dm9601.c')
-rw-r--r-- | drivers/net/usb/dm9601.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 269339769f47..47634b617107 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/usb.h> | 21 | #include <linux/usb.h> |
22 | #include <linux/crc32.h> | 22 | #include <linux/crc32.h> |
23 | #include <linux/usb/usbnet.h> | 23 | #include <linux/usb/usbnet.h> |
24 | #include <linux/slab.h> | ||
24 | 25 | ||
25 | /* datasheet: | 26 | /* datasheet: |
26 | http://ptm2.cc.utu.fi/ftp/network/cards/DM9601/From_NET/DM9601-DS-P01-930914.pdf | 27 | http://ptm2.cc.utu.fi/ftp/network/cards/DM9601/From_NET/DM9601-DS-P01-930914.pdf |
@@ -239,7 +240,7 @@ static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu | |||
239 | goto out; | 240 | goto out; |
240 | 241 | ||
241 | dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg); | 242 | dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg); |
242 | dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1c : 0x14); | 243 | dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1a : 0x12); |
243 | 244 | ||
244 | for (i = 0; i < DM_TIMEOUT; i++) { | 245 | for (i = 0; i < DM_TIMEOUT; i++) { |
245 | u8 tmp; | 246 | u8 tmp; |
@@ -386,10 +387,10 @@ static void dm9601_set_multicast(struct net_device *net) | |||
386 | netdev_mc_count(net) > DM_MAX_MCAST) { | 387 | netdev_mc_count(net) > DM_MAX_MCAST) { |
387 | rx_ctl |= 0x04; | 388 | rx_ctl |= 0x04; |
388 | } else if (!netdev_mc_empty(net)) { | 389 | } else if (!netdev_mc_empty(net)) { |
389 | struct dev_mc_list *mc_list; | 390 | struct netdev_hw_addr *ha; |
390 | 391 | ||
391 | netdev_for_each_mc_addr(mc_list, net) { | 392 | netdev_for_each_mc_addr(ha, net) { |
392 | u32 crc = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26; | 393 | u32 crc = ether_crc(ETH_ALEN, ha->addr) >> 26; |
393 | hashes[crc >> 3] |= 1 << (crc & 0x7); | 394 | hashes[crc >> 3] |= 1 << (crc & 0x7); |
394 | } | 395 | } |
395 | } | 396 | } |