D4775.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4775.id.diff
View Options

	Index: stable/10/sys/net/if_gre.c
	===================================================================
	--- stable/10/sys/net/if_gre.c
	+++ stable/10/sys/net/if_gre.c
	@@ -682,7 +682,10 @@
	struct grehdr *gh;
	struct ifnet *ifp;
	struct mbuf *m;
	- uint32_t *opts, key;
	+ uint32_t *opts;
	+#ifdef notyet
	+ uint32_t key;
	+#endif
	uint16_t flags;
	int hlen, isr, af;

	@@ -715,17 +718,27 @@
	opts++;
	}
	if (flags & GRE_FLAGS_KP) {
	+#ifdef notyet
	+ /*
	+ * XXX: The current implementation uses the key only for outgoing
	+ * packets. But we can check the key value here, or even in the
	+ * encapcheck function.
	+ */
	key = ntohl(*opts);
	+#endif
	hlen += sizeof(uint32_t);
	opts++;
	+ }
	+#ifdef notyet
	} else
	key = 0;
	- /*
	if (sc->gre_key != 0 && (key != sc->gre_key \|\| key != 0))
	goto drop;
	- */
	+#endif
	if (flags & GRE_FLAGS_SP) {
	- /* seq = ntohl(opts); /
	+#ifdef notyet
	+ seq = ntohl(*opts);
	+#endif
	hlen += sizeof(uint32_t);
	}
	switch (ntohs(gh->gre_proto)) {