summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-05-14 14:44:45 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-05-14 14:44:45 +0000
commit862247447080ade16ada92db6469ce5f3ee6dd5e (patch)
tree3c04802750b28b1b1121fa3ffce75e2602905538
parent86c6508a94541d0c943786daa37c4425dd252d87 (diff)
KNF
-rw-r--r--sys/netinet6/ip6_input.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 7432dec920b..829b032c015 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_input.c,v 1.49 2003/05/14 14:24:44 itojun Exp $ */
+/* $OpenBSD: ip6_input.c,v 1.50 2003/05/14 14:44:44 itojun Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -910,15 +910,14 @@ ip6_savecontrol(in6p, mp, ip6, m)
microtime(&tv);
*mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv),
- SCM_TIMESTAMP, SOL_SOCKET);
+ SCM_TIMESTAMP, SOL_SOCKET);
if (*mp)
mp = &(*mp)->m_next;
}
#endif
if (in6p->in6p_flags & IN6P_RECVDSTADDR) {
*mp = sbcreatecontrol((caddr_t) &ip6->ip6_dst,
- sizeof(struct in6_addr), IPV6_RECVDSTADDR,
- IPPROTO_IPV6);
+ sizeof(struct in6_addr), IPV6_RECVDSTADDR, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
}
@@ -942,15 +941,14 @@ ip6_savecontrol(in6p, mp, ip6, m)
? m->m_pkthdr.rcvif->if_index
: 0;
*mp = sbcreatecontrol((caddr_t) &pi6,
- sizeof(struct in6_pktinfo), IPV6_PKTINFO,
- IPPROTO_IPV6);
+ sizeof(struct in6_pktinfo), IPV6_PKTINFO, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
}
if (in6p->in6p_flags & IN6P_HOPLIMIT) {
int hlim = ip6->ip6_hlim & 0xff;
- *mp = sbcreatecontrol((caddr_t) &hlim,
- sizeof(int), IPV6_HOPLIMIT, IPPROTO_IPV6);
+ *mp = sbcreatecontrol((caddr_t) &hlim, sizeof(int),
+ IPV6_HOPLIMIT, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
}
@@ -997,7 +995,7 @@ ip6_savecontrol(in6p, mp, ip6, m)
* But it's too painful operation...
*/
*mp = sbcreatecontrol((caddr_t)hbh, hbhlen,
- IPV6_HOPOPTS, IPPROTO_IPV6);
+ IPV6_HOPOPTS, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
m_freem(ext);
@@ -1065,8 +1063,7 @@ ip6_savecontrol(in6p, mp, ip6, m)
break;
*mp = sbcreatecontrol((caddr_t)ip6e, elen,
- IPV6_DSTOPTS,
- IPPROTO_IPV6);
+ IPV6_DSTOPTS, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
break;
@@ -1076,8 +1073,7 @@ ip6_savecontrol(in6p, mp, ip6, m)
break;
*mp = sbcreatecontrol((caddr_t)ip6e, elen,
- IPV6_RTHDR,
- IPPROTO_IPV6);
+ IPV6_RTHDR, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
break;