diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2009-06-28 11:28:14 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2009-06-28 11:28:14 +0000 |
| commit | bb520069caf7772294f4aa0f1462ac38ea9a3f20 (patch) | |
| tree | 12880e3a07e15788493652721212c558d8c339f1 /sys | |
| parent | c92033c874bb142cb6f94119db9a2b3618546c3f (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_reset.c | 2 | ||||
| -rw-r--r-- | sys/kern/sys_socket.c | 5 | ||||
| -rw-r--r-- | sys/sys/filio.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c index 459358869687..584b558ba6e0 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c @@ -124,7 +124,7 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMODE opmode, if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) { HALDEBUG(ah, HAL_DEBUG_ANY, "%s: chip did not wakeup\n", __func__); - FAIL(HAL_EIO); + // FAIL(HAL_EIO); } /* diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 93da80d26a82..ecfb4adca6d3 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -169,6 +169,11 @@ soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, *(int *)data = so->so_rcv.sb_cc; break; + case FIONWRITE: + /* Unlocked read. */ + *(int *)data = so->so_snd.sb_cc; + break; + case FIOSETOWN: error = fsetown(*(int *)data, &so->so_sigio); break; diff --git a/sys/sys/filio.h b/sys/sys/filio.h index 5f13288b70ce..68e7852a4ceb 100644 --- a/sys/sys/filio.h +++ b/sys/sys/filio.h @@ -55,6 +55,7 @@ struct fiodgname_arg { void *buf; }; #define FIODGNAME _IOW('f', 120, struct fiodgname_arg) /* get dev. name */ +#define FIONWRITE _IOR('f', 119, int) /* get # bytes (yet) to write */ /* Handle lseek SEEK_DATA and SEEK_HOLE for holey file knowledge. */ #define FIOSEEKDATA _IOWR('f', 97, off_t) /* SEEK_DATA */ #define FIOSEEKHOLE _IOWR('f', 98, off_t) /* SEEK_HOLE */ |