From fe55690cb7163cc6821a3a44b96ff6121a6be330 Mon Sep 17 00:00:00 2001
From: Sanket Shah <sanket.shah@elitecore.com>
Date: Tue, 30 Aug 2011 15:23:03 +0200
Subject: [PATCH] --- yaml --- r: 263928 b: refs/heads/master c:
 4c6e4209662b2a4147cde16c2144a253a7430a49 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/net/netfilter/nf_conntrack_pptp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73965e706979..bca1c2547f53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6675233f9015d3c0460c8aab53ed9b99d915c64
+refs/heads/master: 4c6e4209662b2a4147cde16c2144a253a7430a49
diff --git a/trunk/net/netfilter/nf_conntrack_pptp.c b/trunk/net/netfilter/nf_conntrack_pptp.c
index 2fd4565144de..31d56b23b9e9 100644
--- a/trunk/net/netfilter/nf_conntrack_pptp.c
+++ b/trunk/net/netfilter/nf_conntrack_pptp.c
@@ -364,6 +364,7 @@ pptp_inbound_pkt(struct sk_buff *skb,
 		break;
 
 	case PPTP_WAN_ERROR_NOTIFY:
+	case PPTP_SET_LINK_INFO:
 	case PPTP_ECHO_REQUEST:
 	case PPTP_ECHO_REPLY:
 		/* I don't have to explain these ;) */