diff options
author | araujo <araujo@FreeBSD.org> | 2015-12-31 02:01:20 +0000 |
---|---|---|
committer | araujo <araujo@FreeBSD.org> | 2015-12-31 02:01:20 +0000 |
commit | 8da8855e8f1a66d82a9a08a2ac82c9d802bfd2f3 (patch) | |
tree | 43d8585e89518987c1a3a036dd3e1336d6c76e15 /sys/net | |
parent | 8571577d81a2a8b4a5567f4b77fbc388a6d67077 (diff) | |
download | FreeBSD-src-8da8855e8f1a66d82a9a08a2ac82c9d802bfd2f3.zip FreeBSD-src-8da8855e8f1a66d82a9a08a2ac82c9d802bfd2f3.tar.gz |
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, ae
Approved by: bapt (mentor)
Differential Revision: https://reviews.freebsd.org/D4720
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if_gre.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 24ed971..9d4a976 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -682,7 +682,10 @@ gre_input(struct mbuf **mp, int *offp, int proto) 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,28 @@ gre_input(struct mbuf **mp, int *offp, int proto) 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)) { |