diff options
| author | Martin KaFai Lau <kafai@fb.com> | 2015-05-23 03:55:56 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-25 17:25:32 (GMT) |
| commit | 286c2349f6665c3e67f464a5faa14a0e28be4842 (patch) | |
| tree | a6ece8bde9655f0c39edb9d10a8867be7229fb69 /include/net | |
| parent | 01b6961410b76af228eb993220024ff6db6ba80c (diff) | |
| download | linux-286c2349f6665c3e67f464a5faa14a0e28be4842.tar.xz | |
ipv6: Clean up ipv6_select_ident() and ip6_fragment()
This patch changes the ipv6_select_ident() signature to return a
fragment id instead of taking a whole frag_hdr as a param to
only set the frag_hdr->identification.
It also cleans up ip6_fragment() to obtain the fragment id at the
beginning instead of using multiple "if" later to check fragment id
has been generated or not.
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index aab8190..8c4f881 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -671,8 +671,7 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr)); } -void ipv6_select_ident(struct net *net, struct frag_hdr *fhdr, - struct rt6_info *rt); +u32 ipv6_select_ident(struct net *net, struct rt6_info *rt); void ipv6_proxy_select_ident(struct net *net, struct sk_buff *skb); int ip6_dst_hoplimit(struct dst_entry *dst); |