Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 223ab8ff authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipv6_ufo_fix' 



Vladislav Yasevich says:

====================
IPv6 Fix 2 small issues with UFO restoration code

This series fixes 2 small issues introduced by the
"Restore UFO support to virtio_net devices" series.

V2:  Fixed patch title and description for patch1.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 25d3b493 8381eacf

include/net/ipv6.h

+0 −2
Original line number Diff line number Diff line
@@ -671,8 +671,6 @@ 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));

}



u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst,

			struct in6_addr *src);

void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt);

void ipv6_proxy_select_ident(struct sk_buff *skb);

net/ipv6/output_core.c

+3 −2
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
#include <net/addrconf.h>

#include <net/secure_seq.h>



u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst, struct in6_addr *src)

static u32 __ipv6_select_ident(u32 hashrnd, struct in6_addr *dst,

			       struct in6_addr *src)

{

	u32 hash, id;
@@ -54,7 +55,7 @@ void ipv6_proxy_select_ident(struct sk_buff *skb) 


	id = __ipv6_select_ident(ip6_proxy_idents_hashrnd,

				 &addrs[1], &addrs[0]);

	skb_shinfo(skb)->ip6_frag_id = id;

	skb_shinfo(skb)->ip6_frag_id = htonl(id);

}

EXPORT_SYMBOL_GPL(ipv6_proxy_select_ident);