Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index e62683ba88e6..8e429d0e0405 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -341,7 +341,9 @@ struct ipv6_pinfo {
                                 odstopts:1,
                                 rxflow:1,
                                 rxtclass:1,
-                                rxpmtu:1;
+                                rxpmtu:1,
+                                rxorigdstaddr:1;
+                                /* 2 bits hole */
                 } bits;
                 __u16           all;
         } rxopt;