diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2010-09-28 14:14:55 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2010-09-28 14:14:55 +0000 |
| commit | a6aa13e6a2b21b1eef07718edda1dbd891d35517 (patch) | |
| tree | 7b9ff680f8bbb7c549d31fa22cec6dbbfbb329b2 | |
| parent | d6ea21ae854b5232c50a8f7b7515ab129b30f9e7 (diff) | |
wrap long line. correct indent. delete a useless comment.
OK djm@ claudio@ dlg@
| -rw-r--r-- | sys/net/pipex.c | 9 | ||||
| -rw-r--r-- | sys/netinet/ip_gre.c | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/pipex.c b/sys/net/pipex.c index 3dc7be85c6e..5381d6ec854 100644 --- a/sys/net/pipex.c +++ b/sys/net/pipex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.c,v 1.11 2010/09/26 07:04:43 yasuoka Exp $ */ +/* $OpenBSD: pipex.c,v 1.12 2010/09/28 14:14:54 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -958,9 +958,9 @@ pipex_ppp_output(struct mbuf *m0, struct pipex_session *session, int proto) } #endif /* PIPEX_MPPE */ cp = hdr; - PUTCHAR(PPP_ALLSTATIONS, cp); - PUTCHAR(PPP_UI, cp); - PUTSHORT(proto, cp); + PUTCHAR(PPP_ALLSTATIONS, cp); + PUTCHAR(PPP_UI, cp); + PUTSHORT(proto, cp); M_PREPEND(m0, cp - hdr, M_NOWAIT); if (m0 == NULL) @@ -1503,7 +1503,6 @@ pipex_pptp_lookup_session(struct mbuf *m0) uint16_t id; int hlen; - /* pullup */ if (m0->m_pkthdr.len < PIPEX_IPGRE_HDRLEN) { PIPEX_DBG((NULL, LOG_DEBUG, "<%s> packet length is too short", __func__)); diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 43cdfb0b039..ce5fb8b2a3e 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.c,v 1.39 2010/09/24 14:50:30 hsuenaga Exp $ */ +/* $OpenBSD: ip_gre.c,v 1.40 2010/09/28 14:14:54 yasuoka Exp $ */ /* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -463,7 +463,8 @@ gre_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, ina_dst = &sin4->sin_addr; } if (ina_dst != NULL && - (session = pipex_pptp_userland_lookup_session_ipv4(m, *ina_dst))) + (session = pipex_pptp_userland_lookup_session_ipv4(m, + *ina_dst))) m = pipex_pptp_userland_output(m, session); splx(s); |