From owner-cvs-src@FreeBSD.ORG Wed Aug 10 19:12:32 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org 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 EBCB516A41F; Wed, 10 Aug 2005 19:12:32 +0000 (GMT) (envelope-from bz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFCAE43D45; Wed, 10 Aug 2005 19:12:32 +0000 (GMT) (envelope-from bz@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AJCWAF056026; Wed, 10 Aug 2005 19:12:32 GMT (envelope-from bz@repoman.freebsd.org) Received: (from bz@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AJCWDr056025; Wed, 10 Aug 2005 19:12:32 GMT (envelope-from bz) Message-Id: <200508101912.j7AJCWDr056025@repoman.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 10 Aug 2005 19:12:32 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/net if_gre.c src/sys/netinet ip_gre.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 10 Aug 2005 19:12:33 -0000 bz 2005-08-10 19:12:32 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/net if_gre.c sys/netinet ip_gre.c Log: MFC: rev. 1.33 src/sys/net/if_gre.c, rev. 1.20 src/sys/netinet/ip_gre.c Add support for IPv6 over GRE [1]. PR kern/80340 includes the FreeBSD specific ip_newid() changes NetBSD does not have. Correct handling of non AF_INET packets passed to bpf [2]. PR: kern/80340[1], NetBSD PRs 29150[1], 30844[2] Obtained from: NetBSD ip_gre.c rev. 1.34,1.35, if_gre.c rev. 1.56 Submitted by: Gert Doering [2] Approved by: re (kensmith) Revision Changes Path 1.32.2.1 +19 -3 src/sys/net/if_gre.c 1.19.2.1 +12 -3 src/sys/netinet/ip_gre.c