Signed-off-by: James Nelson <james4765@xxxxxxxxx>
diff -urN --exclude='*~' linux-2.6.10-mm2-original/drivers/net/sunhme.c linux-2.6.10-mm2/drivers/net/sunhme.c
--- linux-2.6.10-mm2-original/drivers/net/sunhme.c 2005-01-08 12:16:35.000000000 -0500
+++ linux-2.6.10-mm2/drivers/net/sunhme.c 2005-01-11 18:30:43.394988882 -0500
@@ -112,7 +112,7 @@
struct hme_tx_logent *tlp;
unsigned long flags;
- save_and_cli(flags);
+ spin_lock_irqsave(&happy_lock, flags);
tlp = &tx_log[txlog_cur_entry];
tlp->tstamp = (unsigned int)jiffies;
tlp->tx_new = hp->tx_new;
@@ -120,7 +120,7 @@
tlp->action = a;
tlp->status = s;
txlog_cur_entry = (txlog_cur_entry + 1) & (TX_LOG_LEN - 1);
- restore_flags(flags);
+ spin_unlock_irqrestore(&happy_lock, flags);
}
static __inline__ void tx_dump_log(void)
{
-
: 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
