diff options
| -rw-r--r-- | sys/net/if_gre.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 3b436028742..307ccb46783 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.154 2019/11/07 07:36:31 dlg Exp $ */ +/* $OpenBSD: if_gre.c,v 1.155 2019/11/10 11:44:10 dlg Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -387,7 +387,7 @@ static int egre_input(const struct gre_tunnel *, struct mbuf *, int, uint8_t); struct if_clone egre_cloner = IF_CLONE_INITIALIZER("egre", egre_clone_create, egre_clone_destroy); - + /* protected by NET_LOCK */ struct egre_tree egre_tree = RBT_INITIALIZER(); @@ -540,7 +540,7 @@ static struct mbuf * const struct gre_header *, uint8_t, int); struct if_clone eoip_cloner = IF_CLONE_INITIALIZER("eoip", eoip_clone_create, eoip_clone_destroy); - + /* protected by NET_LOCK */ struct eoip_tree eoip_tree = RBT_INITIALIZER(); @@ -1164,7 +1164,7 @@ gre_input_key(struct mbuf **mp, int *offp, int type, int af, uint8_t otos, m = (*patch)(tunnel, m, &itos, otos); if (m == NULL) - return (IPPROTO_DONE); + return (IPPROTO_DONE); if (tunnel->t_key_mask == GRE_KEY_ENTROPY) { m->m_pkthdr.ph_flowid = M_FLOWID_VALID | @@ -1894,7 +1894,7 @@ mgre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dest, error = EAGAIN; goto drop; } - + /* Try to limit infinite recursion through misconfiguration. */ for (mtag = m_tag_find(m, PACKET_TAG_GRE, NULL); mtag; mtag = m_tag_find(m, PACKET_TAG_GRE, mtag)) { @@ -1980,9 +1980,9 @@ mgre_start(struct ifnet *ifp) #endif if (gre_ip_output(&sc->sc_tunnel, m) != 0) { - ifp->if_oerrors++; - continue; - } + ifp->if_oerrors++; + continue; + } } } @@ -2081,7 +2081,7 @@ gre_l3_encap_dst(const struct gre_tunnel *tunnel, const void *dst, itos = (shim >> MPLS_EXP_OFFSET) << 5; ttloff = 3; - + if (m->m_flags & (M_BCAST | M_MCAST)) proto = htons(ETHERTYPE_MPLS_MCAST); else @@ -2092,10 +2092,10 @@ gre_l3_encap_dst(const struct gre_tunnel *tunnel, const void *dst, default: unhandled_af(af); } - + if (tttl == -1) { KASSERT(m->m_len > ttloff); /* m_pullup has happened */ - + ttl = *(m->m_data + ttloff); } else ttl = tttl; @@ -2543,8 +2543,8 @@ mgre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) /* FALLTHROUGH */ default: error = gre_tunnel_ioctl(ifp, &sc->sc_tunnel, cmd, data); - break; - } + break; + } return (error); } |