diff options
author | Eric Dumazet <edumazet@google.com> | 2015-05-25 19:02:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-25 20:27:11 -0400 |
commit | 7f1598678d4c05e3e085bf780a5ab3119637ac3c (patch) | |
tree | 50a5ec9bb25f0343e89d2ad7eba81d369011533b | |
parent | eedf4c66d06b6c3dbc3abe774d00e3a68cf9ef16 (diff) |
ipv6: ipv6_select_ident() returns a __be32
ipv6_select_ident() returns a 32bit value in network order.
Fixes: 286c2349f666 ("ipv6: Clean up ipv6_select_ident() and ip6_fragment()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/ipv6.h | 6 | ||||
-rw-r--r-- | net/ipv6/output_core.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index b950a2000b7f..35d485c78080 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -671,9 +671,9 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add | |||
671 | return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr)); | 671 | return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr)); |
672 | } | 672 | } |
673 | 673 | ||
674 | u32 ipv6_select_ident(struct net *net, | 674 | __be32 ipv6_select_ident(struct net *net, |
675 | const struct in6_addr *daddr, | 675 | const struct in6_addr *daddr, |
676 | const struct in6_addr *saddr); | 676 | const struct in6_addr *saddr); |
677 | void ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb); | 677 | void ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb); |
678 | 678 | ||
679 | int ip6_dst_hoplimit(struct dst_entry *dst); | 679 | int ip6_dst_hoplimit(struct dst_entry *dst); |
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index 055e85cb7b65..21678acd4521 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c | |||
@@ -61,9 +61,9 @@ void ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb) | |||
61 | } | 61 | } |
62 | EXPORT_SYMBOL_GPL(ipv6_proxy_select_ident); | 62 | EXPORT_SYMBOL_GPL(ipv6_proxy_select_ident); |
63 | 63 | ||
64 | u32 ipv6_select_ident(struct net *net, | 64 | __be32 ipv6_select_ident(struct net *net, |
65 | const struct in6_addr *daddr, | 65 | const struct in6_addr *daddr, |
66 | const struct in6_addr *saddr) | 66 | const struct in6_addr *saddr) |
67 | { | 67 | { |
68 | static u32 ip6_idents_hashrnd __read_mostly; | 68 | static u32 ip6_idents_hashrnd __read_mostly; |
69 | u32 id; | 69 | u32 id; |