diff options
Diffstat (limited to 'drivers/net/dl2k.c')
-rw-r--r-- | drivers/net/dl2k.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index b05bad829827..a2f238d20caa 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
@@ -596,8 +596,6 @@ alloc_list (struct net_device *dev) | |||
596 | /* Set RFDListPtr */ | 596 | /* Set RFDListPtr */ |
597 | writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0); | 597 | writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0); |
598 | writel (0, dev->base_addr + RFDListPtr1); | 598 | writel (0, dev->base_addr + RFDListPtr1); |
599 | |||
600 | return; | ||
601 | } | 599 | } |
602 | 600 | ||
603 | static netdev_tx_t | 601 | static netdev_tx_t |
@@ -1132,14 +1130,14 @@ set_multicast (struct net_device *dev) | |||
1132 | /* Receive broadcast and multicast frames */ | 1130 | /* Receive broadcast and multicast frames */ |
1133 | rx_mode = ReceiveBroadcast | ReceiveMulticast | ReceiveUnicast; | 1131 | rx_mode = ReceiveBroadcast | ReceiveMulticast | ReceiveUnicast; |
1134 | } else if (!netdev_mc_empty(dev)) { | 1132 | } else if (!netdev_mc_empty(dev)) { |
1135 | struct dev_mc_list *mclist; | 1133 | struct netdev_hw_addr *ha; |
1136 | /* Receive broadcast frames and multicast frames filtering | 1134 | /* Receive broadcast frames and multicast frames filtering |
1137 | by Hashtable */ | 1135 | by Hashtable */ |
1138 | rx_mode = | 1136 | rx_mode = |
1139 | ReceiveBroadcast | ReceiveMulticastHash | ReceiveUnicast; | 1137 | ReceiveBroadcast | ReceiveMulticastHash | ReceiveUnicast; |
1140 | netdev_for_each_mc_addr(mclist, dev) { | 1138 | netdev_for_each_mc_addr(ha, dev) { |
1141 | int bit, index = 0; | 1139 | int bit, index = 0; |
1142 | int crc = ether_crc_le (ETH_ALEN, mclist->dmi_addr); | 1140 | int crc = ether_crc_le(ETH_ALEN, ha->addr); |
1143 | /* The inverted high significant 6 bits of CRC are | 1141 | /* The inverted high significant 6 bits of CRC are |
1144 | used as an index to hashtable */ | 1142 | used as an index to hashtable */ |
1145 | for (bit = 0; bit < 6; bit++) | 1143 | for (bit = 0; bit < 6; bit++) |