Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[firefly-linux-kernel-4.4.55.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c694e7baa621b3f76d220589e018dd767fa7bfd0..4d5169f5d7d1844d99d2af6c8d2cb89ad9879bdf 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -52,6 +52,7 @@ struct ipv6_devconf {
        __s32           force_tllao;
        __s32           ndisc_notify;
        __s32           suppress_frag_ndisc;
+       __s32           accept_ra_mtu;
        void            *sysctl;
 };
 
@@ -124,6 +125,12 @@ struct ipv6_mc_socklist;
 struct ipv6_ac_socklist;
 struct ipv6_fl_socklist;
 
+struct inet6_cork {
+       struct ipv6_txoptions *opt;
+       u8 hop_limit;
+       u8 tclass;
+};
+
 /**
  * struct ipv6_pinfo - ipv6 private area
  *
@@ -216,11 +223,7 @@ struct ipv6_pinfo {
        struct ipv6_txoptions   *opt;
        struct sk_buff          *pktoptions;
        struct sk_buff          *rxpmtu;
-       struct {
-               struct ipv6_txoptions *opt;
-               u8 hop_limit;
-               u8 tclass;
-       } cork;
+       struct inet6_cork       cork;
 };
 
 /* WARNING: don't change the layout of the members in {raw,udp,tcp}6_sock! */