Merge tag 'v3.10.95' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / net / ipv6.h

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 27e9ba47b30401f05a791ef0774ace17dea38e57..8645f1bc80345ce0934135147d05964073ba309a 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -487,6 +487,7 @@ struct ip6_create_arg {
        u32 user;
        const struct in6_addr *src;
        const struct in6_addr *dst;
+       int iif;
        u8 ecn;
 };