summaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-30 03:48:57 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-30 03:48:57 -0400
commit2fcf522509cceea524b6e7ece8fd6759b682175a (patch)
treed356e87307e451cce5497ad8daeeeb047befe489 /include/asm-i386
parentda61396d24e37258817e42537c482e962b4742f7 (diff)
parent1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 (diff)
downloadtalos-op-linux-2fcf522509cceea524b6e7ece8fd6759b682175a.tar.gz
talos-op-linux-2fcf522509cceea524b6e7ece8fd6759b682175a.zip
/spare/repo/libata-dev branch 'master'
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/checksum.h2
-rw-r--r--include/asm-i386/socket.h2
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
OpenPOWER on IntegriCloud