summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-28 15:44:44 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-28 15:44:44 -0700
commit05e31754d18169555f2c8b54b5fa8631c6be6e7f (patch)
treef98596a6cad20fc024d7e1d04a8b9cdad302c3b5 /include
parentb082dff349e0a9374d19765f17b3fdceb74fda56 (diff)
parentf8ab18d2d987a59ccbf0495032b2aef05b730037 (diff)
downloadlinux-05e31754d18169555f2c8b54b5fa8631c6be6e7f.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: Fix MD5 signature handling on big-endian. [NET]: Zero length write() on socket should not simply return 0.
Diffstat (limited to 'include')
-rw-r--r--include/net/tcp.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 185c7ecce4cc..54053de0bdd7 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1059,14 +1059,12 @@ struct tcp_md5sig_key {
};
struct tcp4_md5sig_key {
- u8 *key;
- u16 keylen;
+ struct tcp_md5sig_key base;
__be32 addr;
};
struct tcp6_md5sig_key {
- u8 *key;
- u16 keylen;
+ struct tcp_md5sig_key base;
#if 0
u32 scope_id; /* XXX */
#endif