aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/tcp_ipv6.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 21:06:37 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:27:16 -0500
commit8e5200f54062b8af0ed1d186ea0f113854786d89 (patch)
tree71e00b21ae4f8410413f70141aa275529dbbfb84 /net/ipv6/tcp_ipv6.c
parent34bcca28335977e969338c98c6c43a1e08f592b2 (diff)
[NET]: Fix assorted misannotations (from md5 and udplite merges).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r--net/ipv6/tcp_ipv6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d2170da77e5b..0adb337c4b7e 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -739,7 +739,7 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
739 struct scatterlist sg[4]; 739 struct scatterlist sg[4];
740 __u16 data_len; 740 __u16 data_len;
741 int block = 0; 741 int block = 0;
742 __u16 cksum; 742 __sum16 cksum;
743 struct tcp_md5sig_pool *hp; 743 struct tcp_md5sig_pool *hp;
744 struct tcp6_pseudohdr *bp; 744 struct tcp6_pseudohdr *bp;
745 struct hash_desc *desc; 745 struct hash_desc *desc;
@@ -1032,7 +1032,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
1032 1032
1033#ifdef CONFIG_TCP_MD5SIG 1033#ifdef CONFIG_TCP_MD5SIG
1034 if (key) { 1034 if (key) {
1035 u32 *opt = (u32*)(t1 + 1); 1035 __be32 *opt = (__be32*)(t1 + 1);
1036 opt[0] = htonl((TCPOPT_NOP << 24) | 1036 opt[0] = htonl((TCPOPT_NOP << 24) |
1037 (TCPOPT_NOP << 16) | 1037 (TCPOPT_NOP << 16) |
1038 (TCPOPT_MD5SIG << 8) | 1038 (TCPOPT_MD5SIG << 8) |