Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177713860
D55546.1795109830.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None
D55546.1795109830.diff
View Options
diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -4396,7 +4396,7 @@
netinet/in_fib.c optional inet
netinet/in_fib_algo.c optional inet fib_algo
netinet/in_gif.c optional gif inet | netgraph_gif inet
-netinet/ip_gre.c optional gre inet
+netinet/ip_gre.c optional gre inet | gre inet6
netinet/ip_id.c optional inet
netinet/in_jail.c optional inet
netinet/in_mcast.c optional inet
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -327,10 +327,10 @@
#endif
} else if (sc->gre_family == AF_INET6) {
#ifdef INET6
- if (in_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0)
+ if (in6_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0)
nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL,
(const struct in6_addr *)&ifr.ifr_addr);
- if (in_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0)
+ if (in6_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0)
nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL,
(const struct in6_addr *)&ifr.ifr_dstaddr);
#endif
@@ -1041,10 +1041,16 @@
gre_set_addr_nl(struct gre_softc *sc, struct nl_pstate *npt,
struct sockaddr *src, struct sockaddr *dst)
{
+#if defined(INET) || defined(INET6)
union {
+#ifdef INET
struct in_aliasreq in;
+#endif
+#ifdef INET6
struct in6_aliasreq in6;
+#endif
} aliasreq;
+#endif
int error;
/* XXX: this sanity check runs again in in[6]_gre_ioctl */
@@ -1057,16 +1063,18 @@
sx_xlock(&gre_ioctl_sx);
error = in_gre_ioctl(sc, SIOCSIFPHYADDR, (caddr_t)&aliasreq.in);
sx_xunlock(&gre_ioctl_sx);
+ }
#endif
#ifdef INET6
- } else if (src->sa_family == AF_INET6) {
+ else if (src->sa_family == AF_INET6) {
memcpy(&aliasreq.in6.ifra_addr, src, sizeof(struct sockaddr_in6));
memcpy(&aliasreq.in6.ifra_dstaddr, dst, sizeof(struct sockaddr_in6));
sx_xlock(&gre_ioctl_sx);
error = in6_gre_ioctl(sc, SIOCSIFPHYADDR_IN6, (caddr_t)&aliasreq.in6);
sx_xunlock(&gre_ioctl_sx);
+ }
#endif
- } else
+ else
error = EAFNOSUPPORT;
if (error == EADDRNOTAVAIL)
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Nov 19, 5:37 PM (23 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41849570
Default Alt Text
D55546.1795109830.diff (2 KB)
Attached To
Mode
D55546: gre: unbreak LINT-NOINET
Attached
Detach File
Event Timeline