diff options
author | Ken Kawasaki <ken_kawasaki@spring.nifty.jp> | 2009-10-13 03:32:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-13 03:35:55 -0400 |
commit | e3eef534c50ad39654e247f88dc01e6a3f76b6b4 (patch) | |
tree | c643c196e032261c55c0095f7cf04822cce7442d /drivers/net | |
parent | ab854b24a2113ec0c17343e72d22b8876930d0a3 (diff) |
3c574_cs: spin_lock the set_multicast_list function
3c574_cs:
spin_lock the set_multicast_list function.
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index ee8ad3e180dd..b58965a2b3ae 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -251,6 +251,7 @@ static void el3_tx_timeout(struct net_device *dev); | |||
251 | static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 251 | static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
252 | static const struct ethtool_ops netdev_ethtool_ops; | 252 | static const struct ethtool_ops netdev_ethtool_ops; |
253 | static void set_rx_mode(struct net_device *dev); | 253 | static void set_rx_mode(struct net_device *dev); |
254 | static void set_multicast_list(struct net_device *dev); | ||
254 | 255 | ||
255 | static void tc574_detach(struct pcmcia_device *p_dev); | 256 | static void tc574_detach(struct pcmcia_device *p_dev); |
256 | 257 | ||
@@ -266,7 +267,7 @@ static const struct net_device_ops el3_netdev_ops = { | |||
266 | .ndo_tx_timeout = el3_tx_timeout, | 267 | .ndo_tx_timeout = el3_tx_timeout, |
267 | .ndo_get_stats = el3_get_stats, | 268 | .ndo_get_stats = el3_get_stats, |
268 | .ndo_do_ioctl = el3_ioctl, | 269 | .ndo_do_ioctl = el3_ioctl, |
269 | .ndo_set_multicast_list = set_rx_mode, | 270 | .ndo_set_multicast_list = set_multicast_list, |
270 | .ndo_change_mtu = eth_change_mtu, | 271 | .ndo_change_mtu = eth_change_mtu, |
271 | .ndo_set_mac_address = eth_mac_addr, | 272 | .ndo_set_mac_address = eth_mac_addr, |
272 | .ndo_validate_addr = eth_validate_addr, | 273 | .ndo_validate_addr = eth_validate_addr, |
@@ -1161,6 +1162,16 @@ static void set_rx_mode(struct net_device *dev) | |||
1161 | outw(SetRxFilter | RxStation | RxBroadcast, ioaddr + EL3_CMD); | 1162 | outw(SetRxFilter | RxStation | RxBroadcast, ioaddr + EL3_CMD); |
1162 | } | 1163 | } |
1163 | 1164 | ||
1165 | static void set_multicast_list(struct net_device *dev) | ||
1166 | { | ||
1167 | struct el3_private *lp = netdev_priv(dev); | ||
1168 | unsigned long flags; | ||
1169 | |||
1170 | spin_lock_irqsave(&lp->window_lock, flags); | ||
1171 | set_rx_mode(dev); | ||
1172 | spin_unlock_irqrestore(&lp->window_lock, flags); | ||
1173 | } | ||
1174 | |||
1164 | static int el3_close(struct net_device *dev) | 1175 | static int el3_close(struct net_device *dev) |
1165 | { | 1176 | { |
1166 | unsigned int ioaddr = dev->base_addr; | 1177 | unsigned int ioaddr = dev->base_addr; |