diff options
| author | Al Viro <[email protected]> | 2006-11-21 02:06:37 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2006-12-03 05:27:16 +0000 |
| commit | 8e5200f54062b8af0ed1d186ea0f113854786d89 (patch) | |
| tree | 71e00b21ae4f8410413f70141aa275529dbbfb84 /net/ipv6/tcp_ipv6.c | |
| parent | [SCTP]: Even more trivial sctp annotations. (diff) | |
| download | kernel-8e5200f54062b8af0ed1d186ea0f113854786d89.tar.gz kernel-8e5200f54062b8af0ed1d186ea0f113854786d89.zip | |
[NET]: Fix assorted misannotations (from md5 and udplite merges).
Signed-off-by: Al Viro <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
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, struct scatterlist sg[4]; __u16 data_len; int block = 0; - __u16 cksum; + __sum16 cksum; struct tcp_md5sig_pool *hp; struct tcp6_pseudohdr *bp; struct hash_desc *desc; @@ -1032,7 +1032,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) #ifdef CONFIG_TCP_MD5SIG if (key) { - u32 *opt = (u32*)(t1 + 1); + __be32 *opt = (__be32*)(t1 + 1); opt[0] = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) | (TCPOPT_MD5SIG << 8) | |