pipex non-functional change

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: YASUOKA Masahiko
Date: Sunday, September 26, 2010 - 5:44 pm

Attached diff is no functional changes around pipex.  ok?

wrap long line.  correct indent.  delete a useless comment.

Index: netinet/ip_gre.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_gre.c,v
retrieving revision 1.39
diff -u -p -r1.39 ip_gre.c
--- netinet/ip_gre.c	24 Sep 2010 14:50:30 -0000	1.39
+++ netinet/ip_gre.c	27 Sep 2010 00:37:45 -0000
@@ -463,7 +463,8 @@ gre_usrreq(struct socket *so, int req, s
 				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);
 
Index: net/pipex.c
===================================================================
RCS file: /cvs/src/sys/net/pipex.c,v
retrieving revision 1.11
diff -u -p -r1.11 pipex.c
--- net/pipex.c	26 Sep 2010 07:04:43 -0000	1.11
+++ net/pipex.c	27 Sep 2010 00:37:47 -0000
@@ -958,9 +958,9 @@ pipex_ppp_output(struct mbuf *m0, struct
 	}
 #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 *m
 	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__));
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
pipex non-functional change, YASUOKA Masahiko, (Sun Sep 26, 5:44 pm)