diff options
| author | sobomax <sobomax@FreeBSD.org> | 2003-12-30 11:41:43 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2003-12-30 11:41:43 +0000 |
| commit | 96159ed2347341c533d77f2f5e0685b70a4be2ed (patch) | |
| tree | 8f5ead597e01a149ed72cc04b2bcf8c5c862e9b5 /sys/net/if_gre.h | |
| parent | 3c788abc59ad3ecae3795fc57cc26d1a61261b20 (diff) | |
| download | FreeBSD-src-96159ed2347341c533d77f2f5e0685b70a4be2ed.zip FreeBSD-src-96159ed2347341c533d77f2f5e0685b70a4be2ed.tar.gz | |
Sync with NetBSD:
if_gre.c rev.1.41-1.49
o Spell output with two ts.
o Remove assigned-to but not used variable.
o fix grammatical error in a diagnostic message.
o u_short -> u_int16_t.
o gi_len is ip_len, so it has to be network byteorder.
if_gre.h rev.1.11-1.13
o prototype must not have variable name.
o u_short -> u_int16_t.
o Spell address with two d's.
ip_gre.c rev.1.22-1.29
o KNF - return is not a function.
o The "osrc" variable in gre_mobile_input() is only ever set but not
referenced; remove it.
o correct (false) assumptions on mbuf chain. not sure if it really helps, but
anyways, it is necessary to perform m_pullup.
o correct arg to m_pullup (need to count IP header size as well).
o remove redundant adjustment of m->m_pkthdr.len.
o clear m_flags just for safety.
o tabify.
o u_short -> u_int16_t.
MFC after: 2 weeks
Diffstat (limited to 'sys/net/if_gre.h')
| -rw-r--r-- | sys/net/if_gre.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h index 8bed6a6..5f8f373 100644 --- a/sys/net/if_gre.h +++ b/sys/net/if_gre.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_gre.h,v 1.10 2002/02/24 17:22:20 martin Exp $ */ +/* $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $ */ /* $FreeBSD$ */ /* @@ -116,7 +116,7 @@ struct greip { * should be routed over more than one tunnel hop by hop */ struct gre_sre { - u_int16_t sre_family; /* adress family */ + u_int16_t sre_family; /* address family */ u_char sre_offset; /* offset to first octet of active entry */ u_char sre_length; /* number of octets in the SRE. sre_lengthl==0 -> last entry. */ @@ -166,7 +166,7 @@ struct mobip_h { LIST_HEAD(gre_softc_head, gre_softc); extern struct gre_softc_head gre_softc_list; -u_short gre_in_cksum(u_short *p, u_int len); +u_int16_t gre_in_cksum(u_int16_t *, u_int); #endif /* _KERNEL */ #endif |
