diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /drivers/net/gianfar_ethtool.c | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'drivers/net/gianfar_ethtool.c')
| -rw-r--r-- | drivers/net/gianfar_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index ae8e5d3c6c1f..5c566ebc54b8 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c | |||
| @@ -538,7 +538,7 @@ static int gfar_set_rx_csum(struct net_device *dev, uint32_t data) | |||
| 538 | 538 | ||
| 539 | unlock_tx_qs(priv); | 539 | unlock_tx_qs(priv); |
| 540 | unlock_rx_qs(priv); | 540 | unlock_rx_qs(priv); |
| 541 | local_irq_save(flags); | 541 | local_irq_restore(flags); |
| 542 | 542 | ||
| 543 | for (i = 0; i < priv->num_rx_queues; i++) | 543 | for (i = 0; i < priv->num_rx_queues; i++) |
| 544 | gfar_clean_rx_ring(priv->rx_queue[i], | 544 | gfar_clean_rx_ring(priv->rx_queue[i], |