diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:08:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:08:33 -0800 |
| commit | 2d80cb2a5e022225b9512ccc98f7979cc4b92ce8 (patch) | |
| tree | a7f247ba424b5366ce443b3d9cb5b4c7f6538e3f /include/asm-mips/socket.h | |
| parent | 75b566af5cc6f64f9ab5b66608ff8ce18098a2b4 (diff) | |
v2.4.5.8 -> v2.4.5.9
- make sure "sync()" doesn't effectively lock up the machine by
overloading all the IO resources
- fix up some network memory allocations that don't wan tto wait on IO.
- merge with Alan (including MIPS update)
- Jeff Garzik: network driver updates.
- Al Viro: System V FS update (write capability, page cache, mondo cleanups)
- Kai Germaschewski: ISDN cleanups, TURBOPAM driver by Stelian Pop
- Ben Fennema: UDF update (time handling, i_blocks fix)
- Neil Brown: md error handling improvements, knfsd file handle compatibility
- Paul Mackerras: PPC update
- Jakub Jelinek: fix up kernel linker scripts to accept .rodata better
- Patrick Mochel: fix PME handling in pci_enable_wake()
- Chris Mason: reiserfs PF_MEMALLOC handling
Diffstat (limited to 'include/asm-mips/socket.h')
| -rw-r--r-- | include/asm-mips/socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h index 201317fb6445..b8a570fa0af9 100644 --- a/include/asm-mips/socket.h +++ b/include/asm-mips/socket.h @@ -33,7 +33,7 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */ #define SO_RCVLOWAT 0x1004 /* receive low-water mark */ #define SO_SNDTIMEO 0x1005 /* send timeout */ #define SO_RCVTIMEO 0x1006 /* receive timeout */ -#define SO_ACCEPTCONN 0x1007 +#define SO_ACCEPTCONN 0x1009 /* linux-specific, might as well be the same as on i386 */ #define SO_NO_CHECK 11 |