diff options
author | Steve Glendinning <steve.glendinning@smsc.com> | 2009-01-27 00:33:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-27 00:33:16 -0500 |
commit | 1373c0fdbc5b477f5597a3ca9f2c782f15b56886 (patch) | |
tree | 4b589945686cf8f89ebc9b320387dd7c1520fefb /drivers/net | |
parent | a528079e01aa9cf6cddc852d5ab5cf4908974745 (diff) |
smsc911x: leave RX_STOP interrupt permanently enabled
smsc911x_set_multicast_list currently performs the only non-atomic
read-modify-write of INT_EN. This patch permanently enables the
RXSTOP_INT interrupt, and changes the ISR to only conditionally run the
multicast filter workaround code.
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/smsc911x.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index a4a76f194514..aaf0b4314ce2 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -1247,7 +1247,7 @@ static int smsc911x_open(struct net_device *dev) | |||
1247 | napi_enable(&pdata->napi); | 1247 | napi_enable(&pdata->napi); |
1248 | 1248 | ||
1249 | temp = smsc911x_reg_read(pdata, INT_EN); | 1249 | temp = smsc911x_reg_read(pdata, INT_EN); |
1250 | temp |= (INT_EN_TDFA_EN_ | INT_EN_RSFL_EN_); | 1250 | temp |= (INT_EN_TDFA_EN_ | INT_EN_RSFL_EN_ | INT_EN_RXSTOP_INT_EN_); |
1251 | smsc911x_reg_write(pdata, INT_EN, temp); | 1251 | smsc911x_reg_write(pdata, INT_EN, temp); |
1252 | 1252 | ||
1253 | spin_lock_irq(&pdata->mac_lock); | 1253 | spin_lock_irq(&pdata->mac_lock); |
@@ -1419,11 +1419,6 @@ static void smsc911x_set_multicast_list(struct net_device *dev) | |||
1419 | 1419 | ||
1420 | /* Request the hardware to stop, then perform the | 1420 | /* Request the hardware to stop, then perform the |
1421 | * update when we get an RX_STOP interrupt */ | 1421 | * update when we get an RX_STOP interrupt */ |
1422 | smsc911x_reg_write(pdata, INT_STS, INT_STS_RXSTOP_INT_); | ||
1423 | temp = smsc911x_reg_read(pdata, INT_EN); | ||
1424 | temp |= INT_EN_RXSTOP_INT_EN_; | ||
1425 | smsc911x_reg_write(pdata, INT_EN, temp); | ||
1426 | |||
1427 | temp = smsc911x_mac_read(pdata, MAC_CR); | 1422 | temp = smsc911x_mac_read(pdata, MAC_CR); |
1428 | temp &= ~(MAC_CR_RXEN_); | 1423 | temp &= ~(MAC_CR_RXEN_); |
1429 | smsc911x_mac_write(pdata, MAC_CR, temp); | 1424 | smsc911x_mac_write(pdata, MAC_CR, temp); |
@@ -1462,11 +1457,9 @@ static irqreturn_t smsc911x_irqhandler(int irq, void *dev_id) | |||
1462 | /* Called when there is a multicast update scheduled and | 1457 | /* Called when there is a multicast update scheduled and |
1463 | * it is now safe to complete the update */ | 1458 | * it is now safe to complete the update */ |
1464 | SMSC_TRACE(INTR, "RX Stop interrupt"); | 1459 | SMSC_TRACE(INTR, "RX Stop interrupt"); |
1465 | temp = smsc911x_reg_read(pdata, INT_EN); | ||
1466 | temp &= (~INT_EN_RXSTOP_INT_EN_); | ||
1467 | smsc911x_reg_write(pdata, INT_EN, temp); | ||
1468 | smsc911x_reg_write(pdata, INT_STS, INT_STS_RXSTOP_INT_); | 1460 | smsc911x_reg_write(pdata, INT_STS, INT_STS_RXSTOP_INT_); |
1469 | smsc911x_rx_multicast_update_workaround(pdata); | 1461 | if (pdata->multicast_update_pending) |
1462 | smsc911x_rx_multicast_update_workaround(pdata); | ||
1470 | serviced = IRQ_HANDLED; | 1463 | serviced = IRQ_HANDLED; |
1471 | } | 1464 | } |
1472 | 1465 | ||