aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-09 14:21:10 -0800
committerDavid S. Miller <davem@davemloft.net>2015-02-09 14:21:10 -0800
commit223ab8ffeb0c7883304d66e5891004643b0e1c0b (patch)
tree0d11e7f3480efb0409de28bcf207a626dccafb10
parentbridge: Fix inability to add non-vlan fdb entry (diff)
parentipv6: Make __ipv6_select_ident static (diff)
downloadlinux-dev-223ab8ffeb0c7883304d66e5891004643b0e1c0b.tar.xz
linux-dev-223ab8ffeb0c7883304d66e5891004643b0e1c0b.zip
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: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/ipv6.h2
-rw-r--r--net/ipv6/output_core.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 6e416f6d3e3c..fde3b593c3f2 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -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);
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 54520a0bd5e3..74581f706c4d 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -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);