projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[deliverable/linux.git]
/
drivers
/
net
/
gianfar_ethtool.c
diff --git
a/drivers/net/gianfar_ethtool.c
b/drivers/net/gianfar_ethtool.c
index ae8e5d3c6c1f69811fc1b20c0df83e770a940c8b..5c566ebc54b80f7da56a4cdf71b68368065c864f 100644
(file)
--- 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)
unlock_tx_qs(priv);
unlock_rx_qs(priv);
- local_irq_
sav
e(flags);
+ local_irq_
restor
e(flags);
for (i = 0; i < priv->num_rx_queues; i++)
gfar_clean_rx_ring(priv->rx_queue[i],
This page took
0.023157 seconds
and
5
git commands to generate.