diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 08:44:09 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 08:44:09 +0200 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /include/asm-i386 | |
| parent | [ACPI] acpi_video_device_write_state() now works (diff) | |
| parent | Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/... (diff) | |
| download | linux-129521dcc94f781890f8f668219ab79f0073ff9f.tar.xz linux-129521dcc94f781890f8f668219ab79f0073ff9f.zip | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/checksum.h | 2 | ||||
| -rw-r--r-- | include/asm-i386/socket.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-i386/checksum.h b/include/asm-i386/checksum.h index f949e44c2a35..67d3630c4e89 100644 --- a/include/asm-i386/checksum.h +++ b/include/asm-i386/checksum.h @@ -83,7 +83,7 @@ static inline unsigned short ip_fast_csum(unsigned char * iph, "adcl $0, %0 ;\n" "notl %0 ;\n" "2: ;\n" - /* Since the input registers which are loaded with iph and ipl + /* Since the input registers which are loaded with iph and ihl are modified, we must also specify them as outputs, or gcc will assume they contain their original values. */ : "=r" (sum), "=r" (iph), "=r" (ihl) diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h index 07f6b38ad140..802ae76195b7 100644 --- a/include/asm-i386/socket.h +++ b/include/asm-i386/socket.h @@ -14,6 +14,8 @@ #define SO_BROADCAST 6 #define SO_SNDBUF 7 #define SO_RCVBUF 8 +#define SO_SNDBUFFORCE 32 +#define SO_RCVBUFFORCE 33 #define SO_KEEPALIVE 9 #define SO_OOBINLINE 10 #define SO_NO_CHECK 11 |