diff options
Diffstat (limited to 'drivers/net/ewrk3.c')
| -rw-r--r-- | drivers/net/ewrk3.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c index 91e59f3a9d6d..11ba70f49971 100644 --- a/drivers/net/ewrk3.c +++ b/drivers/net/ewrk3.c | |||
| @@ -1169,7 +1169,7 @@ static void set_multicast_list(struct net_device *dev) | |||
| 1169 | static void SetMulticastFilter(struct net_device *dev) | 1169 | static void SetMulticastFilter(struct net_device *dev) |
| 1170 | { | 1170 | { |
| 1171 | struct ewrk3_private *lp = netdev_priv(dev); | 1171 | struct ewrk3_private *lp = netdev_priv(dev); |
| 1172 | struct dev_mc_list *dmi; | 1172 | struct netdev_hw_addr *ha; |
| 1173 | u_long iobase = dev->base_addr; | 1173 | u_long iobase = dev->base_addr; |
| 1174 | int i; | 1174 | int i; |
| 1175 | char *addrs, bit, byte; | 1175 | char *addrs, bit, byte; |
| @@ -1213,8 +1213,8 @@ static void SetMulticastFilter(struct net_device *dev) | |||
| 1213 | } | 1213 | } |
| 1214 | 1214 | ||
| 1215 | /* Update table */ | 1215 | /* Update table */ |
| 1216 | netdev_for_each_mc_addr(dmi, dev) { | 1216 | netdev_for_each_mc_addr(ha, dev) { |
| 1217 | addrs = dmi->dmi_addr; | 1217 | addrs = ha->addr; |
| 1218 | if ((*addrs & 0x01) == 1) { /* multicast address? */ | 1218 | if ((*addrs & 0x01) == 1) { /* multicast address? */ |
| 1219 | crc = ether_crc_le(ETH_ALEN, addrs); | 1219 | crc = ether_crc_le(ETH_ALEN, addrs); |
| 1220 | hashcode = crc & ((1 << 9) - 1); /* hashcode is 9 LSb of CRC */ | 1220 | hashcode = crc & ((1 << 9) - 1); /* hashcode is 9 LSb of CRC */ |
| @@ -1776,8 +1776,7 @@ static int ewrk3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
| 1776 | break; | 1776 | break; |
| 1777 | case EWRK3_SET_MCA: /* Set a multicast address */ | 1777 | case EWRK3_SET_MCA: /* Set a multicast address */ |
| 1778 | if (capable(CAP_NET_ADMIN)) { | 1778 | if (capable(CAP_NET_ADMIN)) { |
| 1779 | if (ioc->len > 1024) | 1779 | if (ioc->len > HASH_TABLE_LEN) { |
| 1780 | { | ||
| 1781 | status = -EINVAL; | 1780 | status = -EINVAL; |
| 1782 | break; | 1781 | break; |
| 1783 | } | 1782 | } |
