l2tp: unmanaged L2TPv3 tunnels fixes

[~andy/linux] / net / l2tp / l2tp_core.h

diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index a961c77e08675c9ebc1fa7f1b8b577634e50471c..f0f318edd3f19280f863e2db279663fadb02d968 100644 (file)
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -133,7 +133,7 @@ struct l2tp_session {
        void (*session_close)(struct l2tp_session *session);
        void (*ref)(struct l2tp_session *session);
        void (*deref)(struct l2tp_session *session);
-#ifdef CONFIG_L2TP_DEBUGFS
+#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
        void (*show)(struct seq_file *m, void *priv);
 #endif
        uint8_t                 priv[0];        /* private data */
@@ -152,7 +152,7 @@ struct l2tp_tunnel_cfg {
        struct in_addr          peer_ip;
        u16                     local_udp_port;
        u16                     peer_udp_port;
-       int                     use_udp_checksums:1;
+       unsigned int            use_udp_checksums:1;
 };
 
 struct l2tp_tunnel {