diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-06-23 16:15:57 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-06-23 16:15:57 +0000 |
| commit | 49c9f8d69c19d87dbdc67c2ce02a8f6b67f49b83 (patch) | |
| tree | 3b9ea94ac43aa3e61363aa7b9f556ada85c2d3ef /sys/netinet/ip_input.c | |
| parent | cef2c01a710f772eedb6f3e6ebca133851d5c7d8 (diff) | |
Remove unneeded ip_id convertions.
Instead of using HTONS macro in some places, use htons directly in the
struct member and save us a few bytes.
Fix comment.
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index d2041d5c5a6..1157935fcf1 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.79 2001/06/23 05:55:40 angelos Exp $ */ +/* $OpenBSD: ip_input.c,v 1.80 2001/06/23 16:15:56 fgsch Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -352,7 +352,6 @@ ipv4_input(m) ipstat.ips_badlen++; goto bad; } - NTOHS(ip->ip_id); NTOHS(ip->ip_off); /* @@ -417,13 +416,11 @@ ipv4_input(m) * as expected when ip_mforward() is called from * ip_output().) */ - ip->ip_id = htons(ip->ip_id); if (ip_mforward(m, m->m_pkthdr.rcvif) != 0) { ipstat.ips_cantforward++; m_freem(m); return; } - ip->ip_id = ntohs(ip->ip_id); /* * The process-level routing demon needs to receive @@ -1129,7 +1126,6 @@ ip_dooptions(m) return (0); bad: ip->ip_len -= ip->ip_hl << 2; /* XXX icmp_error adds in hdr length */ - HTONS(ip->ip_id); icmp_error(m, type, code, 0, 0); ipstat.ips_badoptions++; return (1); @@ -1379,7 +1375,6 @@ ip_forward(m, srcrt) m_freem(m); return; } - HTONS(ip->ip_id); if (ip->ip_ttl <= IPTTLDEC) { icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, dest, 0); return; |