diff options
Diffstat (limited to 'drivers/net/usb/catc.c')
| -rw-r--r-- | drivers/net/usb/catc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 96f1ebe0d348..97687d335903 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 38 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/netdevice.h> | 39 | #include <linux/netdevice.h> |
| 41 | #include <linux/etherdevice.h> | 40 | #include <linux/etherdevice.h> |
| 42 | #include <linux/skbuff.h> | 41 | #include <linux/skbuff.h> |
| @@ -44,6 +43,7 @@ | |||
| 44 | #include <linux/ethtool.h> | 43 | #include <linux/ethtool.h> |
| 45 | #include <linux/crc32.h> | 44 | #include <linux/crc32.h> |
| 46 | #include <linux/bitops.h> | 45 | #include <linux/bitops.h> |
| 46 | #include <linux/gfp.h> | ||
| 47 | #include <asm/uaccess.h> | 47 | #include <asm/uaccess.h> |
| 48 | 48 | ||
| 49 | #undef DEBUG | 49 | #undef DEBUG |
| @@ -629,7 +629,7 @@ static void catc_multicast(unsigned char *addr, u8 *multicast) | |||
| 629 | static void catc_set_multicast_list(struct net_device *netdev) | 629 | static void catc_set_multicast_list(struct net_device *netdev) |
| 630 | { | 630 | { |
| 631 | struct catc *catc = netdev_priv(netdev); | 631 | struct catc *catc = netdev_priv(netdev); |
| 632 | struct dev_mc_list *mc; | 632 | struct netdev_hw_addr *ha; |
| 633 | u8 broadcast[6]; | 633 | u8 broadcast[6]; |
| 634 | u8 rx = RxEnable | RxPolarity | RxMultiCast; | 634 | u8 rx = RxEnable | RxPolarity | RxMultiCast; |
| 635 | 635 | ||
| @@ -647,8 +647,8 @@ static void catc_set_multicast_list(struct net_device *netdev) | |||
| 647 | if (netdev->flags & IFF_ALLMULTI) { | 647 | if (netdev->flags & IFF_ALLMULTI) { |
| 648 | memset(catc->multicast, 0xff, 64); | 648 | memset(catc->multicast, 0xff, 64); |
| 649 | } else { | 649 | } else { |
| 650 | netdev_for_each_mc_addr(mc, netdev) { | 650 | netdev_for_each_mc_addr(ha, netdev) { |
| 651 | u32 crc = ether_crc_le(6, mc->dmi_addr); | 651 | u32 crc = ether_crc_le(6, ha->addr); |
| 652 | if (!catc->is_f5u011) { | 652 | if (!catc->is_f5u011) { |
| 653 | catc->multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7); | 653 | catc->multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7); |
| 654 | } else { | 654 | } else { |
