aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c4
-rw-r--r--net/ipv6/udp.c2
-rw-r--r--net/ipv6/udplite.c2
3 files changed, 4 insertions, 4 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) |
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index efa8950ddd30..b3ea8af50a9b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -248,7 +248,7 @@ out:
248 248
249static __inline__ void udpv6_err(struct sk_buff *skb, 249static __inline__ void udpv6_err(struct sk_buff *skb,
250 struct inet6_skb_parm *opt, int type, 250 struct inet6_skb_parm *opt, int type,
251 int code, int offset, __u32 info ) 251 int code, int offset, __be32 info )
252{ 252{
253 return __udp6_lib_err(skb, opt, type, code, offset, info, udp_hash); 253 return __udp6_lib_err(skb, opt, type, code, offset, info, udp_hash);
254} 254}
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index e0ec5e63004a..d4cafacc235b 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -24,7 +24,7 @@ static __inline__ int udplitev6_rcv(struct sk_buff **pskb)
24 24
25static __inline__ void udplitev6_err(struct sk_buff *skb, 25static __inline__ void udplitev6_err(struct sk_buff *skb,
26 struct inet6_skb_parm *opt, 26 struct inet6_skb_parm *opt,
27 int type, int code, int offset, __u32 info) 27 int type, int code, int offset, __be32 info)
28{ 28{
29 return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash); 29 return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash);
30} 30}