From owner-cvs-all Mon Jul 29 23:22:46 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 394B137B400; Mon, 29 Jul 2002 23:22:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E09BA43E42; Mon, 29 Jul 2002 23:22:41 -0700 (PDT) (envelope-from imp@FreeBSD.org) Received: from freefall.freebsd.org (imp@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U6MfJU096805; Mon, 29 Jul 2002 23:22:41 -0700 (PDT) (envelope-from imp@freefall.freebsd.org) Received: (from imp@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U6Mf3G096804; Mon, 29 Jul 2002 23:22:41 -0700 (PDT) Message-Id: <200207300622.g6U6Mf3G096804@freefall.freebsd.org> From: Warner Losh Date: Mon, 29 Jul 2002 23:22:41 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/net if_media.h X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG imp 2002/07/29 23:22:41 PDT Modified files: (Branch: RELENG_4) sys/net if_media.h Log: MFC: Merge most of this file from -current to here. All those values that are the same or have been added have been merged. All the silly white space differences were merged. All the __P removals were merged. I didn't merge the changes to the ethernet media types because they had been renumbered in -current and I didn't want to break binary compatibility within -stable. Added: IBSS and IBSSMASTER media types. Revision Changes Path 1.9.2.4 +39 -35 src/sys/net/if_media.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message