From owner-cvs-src@FreeBSD.ORG Tue Dec 30 03:41:44 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7135516A4CE; Tue, 30 Dec 2003 03:41:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 833CC43D53; Tue, 30 Dec 2003 03:41:43 -0800 (PST) (envelope-from sobomax@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBUBfh0B012522; Tue, 30 Dec 2003 03:41:43 -0800 (PST) (envelope-from sobomax@repoman.freebsd.org) Received: (from sobomax@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBUBfhNf012521; Tue, 30 Dec 2003 03:41:43 -0800 (PST) (envelope-from sobomax) Message-Id: <200312301141.hBUBfhNf012521@repoman.freebsd.org> From: Maxim Sobolev Date: Tue, 30 Dec 2003 03:41:43 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/net if_gre.c if_gre.h src/sys/netinet ip_gre.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Dec 2003 11:41:44 -0000 sobomax 2003/12/30 03:41:43 PST FreeBSD src repository Modified files: sys/net if_gre.c if_gre.h sys/netinet ip_gre.c Log: 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 Revision Changes Path 1.17 +11 -12 src/sys/net/if_gre.c 1.8 +3 -3 src/sys/net/if_gre.h 1.12 +45 -22 src/sys/netinet/ip_gre.c