svn commit: r293410 - stable/10/sys/net
Marcelo Araujo
araujo at FreeBSD.org
Fri Jan 8 02:58:12 UTC 2016
Author: araujo
Date: Fri Jan 8 02:58:10 2016
New Revision: 293410
URL: https://svnweb.freebsd.org/changeset/base/293410
Log:
MFC: r292972
Wrap using #ifdef 'notyet' those variables and statements not yet
implemented to lower the compiler warnings.
It fix the case of unused-but-set-variable spotted by gcc4.9.
Reviewed by: ngie
Approved by: rodrigc (mentor)
Sponsored by: gandi.net
Differential Revision: https://reviews.freebsd.org/D4775
Modified:
stable/10/sys/net/if_gre.c
Modified: stable/10/sys/net/if_gre.c
==============================================================================
--- stable/10/sys/net/if_gre.c Fri Jan 8 02:56:21 2016 (r293409)
+++ stable/10/sys/net/if_gre.c Fri Jan 8 02:58:10 2016 (r293410)
@@ -682,7 +682,10 @@ gre_input(struct mbuf **mp, int *offp, i
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 @@ gre_input(struct mbuf **mp, int *offp, i
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)) {
More information about the svn-src-stable-10
mailing list