Commit f86e71e8 authored by Zwane Mwaikambo's avatar Zwane Mwaikambo Committed by Richard Henderson

[PATCH] cli/sti cleanup for fmvj18x

This one should be safe as we're protected by the xmit_lock in all instances
parent 08d84e53
......@@ -923,8 +923,7 @@ static void fjn_tx_timeout(struct net_device *dev)
htons(inw(ioaddr +14)));
lp->stats.tx_errors++;
/* ToDo: We should try to restart the adaptor... */
cli();
local_irq_disable();
fjn_reset(dev);
lp->tx_started = 0;
......@@ -932,7 +931,7 @@ static void fjn_tx_timeout(struct net_device *dev)
lp->tx_queue_len = 0;
lp->sent = 0;
lp->open_time = jiffies;
sti();
local_irq_enable();
netif_wake_queue(dev);
}
......@@ -1362,8 +1361,7 @@ static void set_rx_mode(struct net_device *dev)
}
}
save_flags(flags);
cli();
local_irq_save(flags);
if (memcmp(mc_filter, lp->mc_filter, sizeof(mc_filter))) {
int saved_bank = inb(ioaddr + CONFIG_1);
/* Switch to bank 1 and set the multicast table. */
......@@ -1373,5 +1371,5 @@ static void set_rx_mode(struct net_device *dev)
memcpy(lp->mc_filter, mc_filter, sizeof(mc_filter));
outb(saved_bank, ioaddr + CONFIG_1);
}
restore_flags(flags);
local_irq_restore(flags);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment