diff options
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 5ba9d989f8fc..3dff280b438b 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/if_vlan.h> | 31 | #include <linux/if_vlan.h> |
| 32 | #include <linux/in.h> | 32 | #include <linux/in.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/gfp.h> | ||
| 34 | #include <linux/ioport.h> | 35 | #include <linux/ioport.h> |
| 35 | #include <linux/ip.h> | 36 | #include <linux/ip.h> |
| 36 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| @@ -40,7 +41,6 @@ | |||
| 40 | #include <linux/device.h> | 41 | #include <linux/device.h> |
| 41 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
| 42 | #include <linux/skbuff.h> | 43 | #include <linux/skbuff.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/tcp.h> | 44 | #include <linux/tcp.h> |
| 45 | #include <linux/types.h> | 45 | #include <linux/types.h> |
| 46 | #include <linux/vmalloc.h> | 46 | #include <linux/vmalloc.h> |
| @@ -625,7 +625,7 @@ spider_net_get_multicast_hash(struct net_device *netdev, __u8 *addr) | |||
| 625 | static void | 625 | static void |
| 626 | spider_net_set_multi(struct net_device *netdev) | 626 | spider_net_set_multi(struct net_device *netdev) |
| 627 | { | 627 | { |
| 628 | struct dev_mc_list *mc; | 628 | struct netdev_hw_addr *ha; |
| 629 | u8 hash; | 629 | u8 hash; |
| 630 | int i; | 630 | int i; |
| 631 | u32 reg; | 631 | u32 reg; |
| @@ -646,8 +646,8 @@ spider_net_set_multi(struct net_device *netdev) | |||
| 646 | hash = spider_net_get_multicast_hash(netdev, netdev->broadcast); */ | 646 | hash = spider_net_get_multicast_hash(netdev, netdev->broadcast); */ |
| 647 | set_bit(0xfd, bitmask); | 647 | set_bit(0xfd, bitmask); |
| 648 | 648 | ||
| 649 | netdev_for_each_mc_addr(mc, netdev) { | 649 | netdev_for_each_mc_addr(ha, netdev) { |
| 650 | hash = spider_net_get_multicast_hash(netdev, mc->dmi_addr); | 650 | hash = spider_net_get_multicast_hash(netdev, ha->addr); |
| 651 | set_bit(hash, bitmask); | 651 | set_bit(hash, bitmask); |
| 652 | } | 652 | } |
| 653 | 653 | ||
