diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-02-09 14:21:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-09 14:21:10 -0800 |
| commit | 223ab8ffeb0c7883304d66e5891004643b0e1c0b (patch) | |
| tree | 0d11e7f3480efb0409de28bcf207a626dccafb10 /net | |
| parent | bridge: Fix inability to add non-vlan fdb entry (diff) | |
| parent | ipv6: Make __ipv6_select_ident static (diff) | |
| download | linux-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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/output_core.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |