Signed-off-by: James Nelson <james4765@xxxxxxxxx> diff -urN --exclude='*~' linux-2.6.10-mm2-original/drivers/net/cris/eth_v10.c linux-2.6.10-mm2/drivers/net/cris/eth_v10.c --- linux-2.6.10-mm2-original/drivers/net/cris/eth_v10.c 2005-01-08 12:16:35.000000000 -0500 +++ linux-2.6.10-mm2/drivers/net/cris/eth_v10.c 2005-01-11 18:35:03.560865558 -0500 @@ -721,8 +721,8 @@ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, crc, enable); *R_NETWORK_TR_CTRL = network_tr_ctrl_shadow; - save_flags(flags); - cli(); + /* Disable interrupts */ + local_irq_save(flags); /* enable the irq's for ethernet DMA */ @@ -755,7 +755,7 @@ *R_DMA_CH0_FIRST = 0; *R_DMA_CH0_DESCR = virt_to_phys(myLastTxDesc); - restore_flags(flags); + local_irq_restore(flags); /* Probe for transceiver */ if (e100_probe_transceiver(dev)) - : send the line "unsubscribe linux-net" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html