2 files changed, 8 insertions, 30 deletions

diff --git a/include/linux/netfilter/nf_conntrack_proto_gre.h b/include/linux/netfilter/nf_conntrack_proto_gre.h
index 4e6bbce04ff8..535e4219d2bb 100644
--- a/include/linux/netfilter/nf_conntrack_proto_gre.h
+++ b/include/linux/netfilter/nf_conntrack_proto_gre.h
@@ -87,24 +87,6 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,
 /* delete keymap entries */
 void nf_ct_gre_keymap_destroy(struct nf_conn *ct);
 
-/* get pointer to gre key, if present */
-static inline __be32 *gre_key(struct gre_hdr *greh)
-{
-        if (!greh->key)
-                return NULL;
-        if (greh->csum || greh->routing)
-                return (__be32 *)(greh+sizeof(*greh)+4);
-        return (__be32 *)(greh+sizeof(*greh));
-}
-
-/* get pointer ot gre csum, if present */
-static inline __sum16 *gre_csum(struct gre_hdr *greh)
-{
-        if (!greh->csum)
-                return NULL;
-        return (__sum16 *)(greh+sizeof(*greh));
-}
-
 extern void nf_ct_gre_keymap_flush(void);
 extern void nf_nat_need_gre(void);
 
diff --git a/net/ipv4/netfilter/nf_nat_proto_gre.c b/net/ipv4/netfilter/nf_nat_proto_gre.c
index e5a34c17d927..c3908bc5a709 100644
--- a/net/ipv4/netfilter/nf_nat_proto_gre.c
+++ b/net/ipv4/netfilter/nf_nat_proto_gre.c
@@ -72,6 +72,11 @@ gre_unique_tuple(struct nf_conntrack_tuple *tuple,
         __be16 *keyptr;
         unsigned int min, i, range_size;
 
+        /* If there is no master conntrack we are not PPTP,
+           do not change tuples */
+        if (!conntrack->master)
+                return 0;
+
         if (maniptype == IP_NAT_MANIP_SRC)
                 keyptr = &tuple->src.u.gre.key;
         else
@@ -122,18 +127,9 @@ gre_manip_pkt(struct sk_buff **pskb, unsigned int iphdroff,
         if (maniptype != IP_NAT_MANIP_DST)
                 return 1;
         switch (greh->version) {
-        case 0:
-                if (!greh->key) {
-                        DEBUGP("can't nat GRE w/o key\n");
-                        break;
-                }
-                if (greh->csum) {
-                        /* FIXME: Never tested this code... */
-                        nf_proto_csum_replace4(gre_csum(greh), *pskb,
-                                               *(gre_key(greh)),
-                                               tuple->dst.u.gre.key, 0);
-                }
-                *(gre_key(greh)) = tuple->dst.u.gre.key;
+        case GRE_VERSION_1701:
+                /* We do not currently NAT any GREv0 packets.
+                 * Try to behave like "nf_nat_proto_unknown" */
                 break;
         case GRE_VERSION_PPTP:
                 DEBUGP("call_id -> 0x%04x\n", ntohs(tuple->dst.u.gre.key));