PERFORCE change 99703 for review
John Baldwin
jhb at FreeBSD.org
Tue Jun 20 21:37:46 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=99703
Change 99703 by jhb at jhb_mutex on 2006/06/20 21:36:58
IFC @99701 - more loopback.
Affected files ...
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#40 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#73 integrate
.. //depot/projects/smpng/sys/kern/link_elf.c#38 integrate
.. //depot/projects/smpng/sys/kern/link_elf_obj.c#13 integrate
.. //depot/projects/smpng/sys/net/if_bridge.c#31 integrate
Differences ...
==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#40 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.105 2006/06/20 20:37:17 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.106 2006/06/20 21:31:38 jhb Exp $");
/*
* This file implements a translation layer between the BSD networking
==== //depot/projects/smpng/sys/kern/kern_linker.c#73 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.133 2006/06/20 20:54:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.134 2006/06/20 21:31:38 jhb Exp $");
#include "opt_ddb.h"
#include "opt_hwpmc_hooks.h"
==== //depot/projects/smpng/sys/kern/link_elf.c#38 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.87 2005/12/18 04:52:36 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.88 2006/06/20 21:31:38 jhb Exp $");
#include "opt_gdb.h"
#include "opt_mac.h"
==== //depot/projects/smpng/sys/kern/link_elf_obj.c#13 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.90 2005/12/18 04:52:36 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.91 2006/06/20 21:31:38 jhb Exp $");
#include "opt_ddb.h"
#include "opt_mac.h"
==== //depot/projects/smpng/sys/net/if_bridge.c#31 (text+ko) ====
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.64 2006/06/19 02:25:11 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.65 2006/06/20 21:28:18 thompsa Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1363,6 +1363,7 @@
switch (ifs->if_type) {
case IFT_ETHER:
+ case IFT_GIF:
case IFT_L2VLAN:
break;
default:
More information about the p4-projects
mailing list