diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-18 09:21:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-18 09:21:07 -0700 |
| commit | af9429086db125c1f63d8dc659fc5e758b5e3827 (patch) | |
| tree | 25a5b0fbd1e0c277819b3e8db473e68ec101766f /include/linux | |
| parent | 1b44cb9121fa6e95eff381093c4a60823ea6a9af (diff) | |
| parent | b3e20e41ed7ba22d11dce0a148cebfeba6cef092 (diff) | |
Merge http://linux-acpi.bkbits.net/linux-acpi
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nbd.h | 2 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/nbd.h b/include/linux/nbd.h index e2c507ba6b08..d2e9309f1a76 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h @@ -59,7 +59,7 @@ nbd_end_request(struct request *req) blk_finished_io(nsect); req->bio = bio->bi_next; bio->bi_next = NULL; - bio_endio(bio, uptodate); + bio_endio(bio, nsect << 9, uptodate ? 0 : -EIO); } blk_put_request(req); spin_unlock_irqrestore(q->queue_lock, flags); diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6ed74303fbda..c73a00744bc8 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -691,6 +691,8 @@ enum { NETIF_MSG_TX_DONE = 0x0400, NETIF_MSG_RX_STATUS = 0x0800, NETIF_MSG_PKTDATA = 0x1000, + NETIF_MSG_HW = 0x2000, + NETIF_MSG_WOL = 0x4000, }; #define netif_msg_drv(p) ((p)->msg_enable & NETIF_MSG_DRV) @@ -706,6 +708,8 @@ enum { #define netif_msg_tx_done(p) ((p)->msg_enable & NETIF_MSG_TX_DONE) #define netif_msg_rx_status(p) ((p)->msg_enable & NETIF_MSG_RX_STATUS) #define netif_msg_pktdata(p) ((p)->msg_enable & NETIF_MSG_PKTDATA) +#define netif_msg_hw(p) ((p)->msg_enable & NETIF_MSG_HW) +#define netif_msg_wol(p) ((p)->msg_enable & NETIF_MSG_WOL) /* Schedule rx intr now? */ |