Merge remote-tracking branch 'upstream/master'

1 files changed, 12 insertions, 12 deletions

diff --git a/src/cmd/ip/snoopy/ppp.c b/src/cmd/ip/snoopy/ppp.c
index 9319cdae..453f711d 100755..100644
--- a/src/cmd/ip/snoopy/ppp.c
+++ b/src/cmd/ip/snoopy/ppp.c
@@ -192,7 +192,7 @@ p_seprint(Msg *m)
 	proto = *m->ps++;
 	if((proto&1) == 0)
 		proto = (proto<<8) | *m->ps++;
-	
+
 	m->p = seprint(m->p, m->e, "pr=%ud len=%d", proto, len);
 	demux(p_mux, proto, proto, m, &dump);
 
@@ -384,25 +384,25 @@ seprintipcpopt(char *p, char *e, void *a, int len)
 		default:
 			p = seprint(p, e, " (type=%d len=%d)", o->type, o->len);
 			break;
-		case Oipaddrs:	
+		case Oipaddrs:
 			p = seprint(p, e, " ipaddrs(deprecated)");
 			break;
 		case Oipcompress:
 			p = seprint(p, e, " ipcompress");
 			break;
-		case Oipaddr:	
+		case Oipaddr:
 			p = seprint(p, e, " ipaddr=%V", o->data);
 			break;
-		case Oipdns:	
+		case Oipdns:
 			p = seprint(p, e, " dnsaddr=%V", o->data);
 			break;
-		case Oipwins:	
+		case Oipwins:
 			p = seprint(p, e, " winsaddr=%V", o->data);
 			break;
-		case Oipdns2:	
+		case Oipdns2:
 			p = seprint(p, e, " dns2addr=%V", o->data);
 			break;
-		case Oipwins2:	
+		case Oipwins2:
 			p = seprint(p, e, " wins2addr=%V", o->data);
 			break;
 		}
@@ -430,7 +430,7 @@ p_seprintipcp(Msg *m)
 		m->pe = m->ps+len;
 	else if(m->ps+len > m->pe)
 		return -1;
-		
+
 	p = seprint(p, e, "id=%d code=%d", lcp->id, lcp->code);
 	switch(lcp->code) {
 	default:
@@ -467,13 +467,13 @@ seprintccpopt(char *p, char *e, void *a, int len)
 			p = seprint(p, e, " bad opt len %ux", o->type);
 			return p;
 		}
-		
+
 		switch(o->type){
 		default:
 			p = seprint(p, e, " type=%d ", o->type);
 			break;
 		case 0:
-			p = seprint(p, e, " OUI=(%d %.2ux%.2ux%.2ux) ", o->type, 
+			p = seprint(p, e, " OUI=(%d %.2ux%.2ux%.2ux) ", o->type,
 				o->data[0], o->data[1], o->data[2]);
 			break;
 		case 17:
@@ -507,7 +507,7 @@ p_seprintccp(Msg *m)
 		m->pe = m->ps+len;
 	else if(m->ps+len > m->pe)
 		return -1;
-		
+
 	p = seprint(p, e, "id=%d code=%d", lcp->id, lcp->code);
 	switch(lcp->code) {
 	default:
@@ -528,7 +528,7 @@ p_seprintccp(Msg *m)
 		break;
 	}
 	m->p = seprint(p, e, " len=%d", len);
-	
+
 	return 0;
 }