From c97b8a56072549e898167dbe9848f255ae08a5d4 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 4 Apr 2010 01:02:46 -0700
Subject: [PATCH] --- yaml --- r: 193954 b: refs/heads/master c:
 7bddd0db6248d92adb1f547fd45507af4368d6fa h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/l2tp/l2tp_core.c | 2 +-
 trunk/net/l2tp/l2tp_core.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4b1d2425171a..22f240cbbe4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 486f50ca796a2572c42c34dd4378cdc8eeb0b137
+refs/heads/master: 7bddd0db6248d92adb1f547fd45507af4368d6fa
diff --git a/trunk/net/l2tp/l2tp_core.c b/trunk/net/l2tp/l2tp_core.c
index 13ed85baf4e9..98dfcce1a5fc 100644
--- a/trunk/net/l2tp/l2tp_core.c
+++ b/trunk/net/l2tp/l2tp_core.c
@@ -1227,7 +1227,7 @@ static int l2tp_tunnel_sock_create(u32 tunnel_id, u32 peer_tunnel_id, struct l2t
 	int err = -EINVAL;
 	struct sockaddr_in udp_addr;
 	struct sockaddr_l2tpip ip_addr;
-	struct socket *sock;
+	struct socket *sock = NULL;
 
 	switch (cfg->encap) {
 	case L2TP_ENCAPTYPE_UDP:
diff --git a/trunk/net/l2tp/l2tp_core.h b/trunk/net/l2tp/l2tp_core.h
index 91b1b9ca5cfa..f0f318edd3f1 100644
--- a/trunk/net/l2tp/l2tp_core.h
+++ b/trunk/net/l2tp/l2tp_core.h
@@ -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 {