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 /include/net | |
| parent | 25d3b493a52d4ece811ba07881558fc7f6778fb8 (diff) | |
| parent | 8381eacf5c3b35cf7755f4bc521c4d56d24c1cd9 (diff) | |
| download | linux-223ab8ffeb0c7883304d66e5891004643b0e1c0b.tar.bz2 | |
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 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 2 |
1 files changed, 0 insertions, 2 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); |