diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-01-31 19:45:13 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-01-31 19:45:13 +0000 |
| commit | dea8eefd6214e3ad5b54795fa958ab721d58710c (patch) | |
| tree | f210aa8b10d18345ea90980eef13ea0c6a2665ee /xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c | |
| parent | f21e4de207c89ca1f1d18122c43db30b2ff41e7b (diff) | |
| download | xen-dea8eefd6214e3ad5b54795fa958ab721d58710c.tar.gz xen-dea8eefd6214e3ad5b54795fa958ab721d58710c.tar.bz2 xen-dea8eefd6214e3ad5b54795fa958ab721d58710c.zip | |
bitkeeper revision 1.699 (401c05c9TV2zsaZ_e3zpy-zaKxCetw)
timer.c, timer.h, sched.h:
new file
Many files:
Rolf's new timer interface, plus various cleanups.
Diffstat (limited to 'xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c')
| -rw-r--r-- | xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c b/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c index ac557a3c11..075acdf5af 100644 --- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c +++ b/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c @@ -81,15 +81,15 @@ static void _dbg_network_int(struct net_device *dev) if ( np->state == STATE_CLOSED ) return; - printk(KERN_ALERT "tx_full = %d, tx_resp_cons = 0x%08x," - " tx_req_prod = 0x%08x, tx_resp_prod = 0x%08x," - " tx_event = 0x%08x, state=%d\n", + printk(KERN_ALERT "net: tx_full=%d, tx_resp_cons=0x%08x," + " tx_req_prod=0x%08x\nnet: tx_resp_prod=0x%08x," + " tx_event=0x%08x, state=%d\n", np->tx_full, np->tx_resp_cons, np->net_idx->tx_req_prod, np->net_idx->tx_resp_prod, np->net_idx->tx_event, test_bit(__LINK_STATE_XOFF, &dev->state)); - printk(KERN_ALERT "rx_resp_cons = 0x%08x," - " rx_req_prod = 0x%08x, rx_resp_prod = 0x%08x, rx_event = 0x%08x\n", + printk(KERN_ALERT "net: rx_resp_cons=0x%08x," + " rx_req_prod=0x%08x\nnet: rx_resp_prod=0x%08x, rx_event=0x%08x\n", np->rx_resp_cons, np->net_idx->rx_req_prod, np->net_idx->rx_resp_prod, np->net_idx->rx_event); } @@ -550,7 +550,8 @@ int __init init_module(void) goto fail; } - err = request_irq(_EVENT_DEBUG, dbg_network_int, 0, "debug", NULL); + err = request_irq(_EVENT_DEBUG, dbg_network_int, SA_SHIRQ, "net_dbg", + &dbg_network_int); if ( err ) printk(KERN_WARNING "Non-fatal error -- no debug interrupt\n"); |