Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

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

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 90b5fae5d714ae71f0c51fddb5e9a621501092c9..a6577af0c4e64de0f93e6c88e70264eab77c3fc5 100644 (file)
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -72,6 +72,15 @@ struct sockaddr_pppol2tp {
        struct pppol2tp_addr pppol2tp;
 }__attribute__ ((packed));
 
+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure.
+ */
+struct sockaddr_pppol2tpv3 {
+       sa_family_t     sa_family;      /* address family, AF_PPPOX */
+       unsigned int    sa_protocol;    /* protocol identifier */
+       struct pppol2tpv3_addr pppol2tp;
+} __attribute__ ((packed));
+
 /*********************************************************************
  *
  * ioctl interface for defining forwarding of connections