misc/123110: buildworld broken on 6-STABLE

[barbara]

>Number:         123110
>Category:       misc
>Synopsis:       buildworld broken on 6-STABLE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 26 11:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     barbara
>Release:        6-STABLE
>Organization:
>Environment:
FreeBSD satanasso.local.net 6.3-STABLE FreeBSD 6.3-STABLE #0: Sat Apr 19 02:50:27 CEST 2008 root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386
>Description:
As reported here
http://lists.freebsd.org/pipermail/freebsd-stable/2008-April/042195.html
buildworld on 6-STABLE is broken.
I think that this is caused by the MFC of the recent changes on sys/netinet/ip_dummynet.h, not reported on sys/net/if_bridge.c (that in the meanwhile, has been removed).

>How-To-Repeat:
Run make buildworld on 6-STABLE with updated sources.
>Fix:
Reflect the changes on bridge.c


Patch attached with submission follows:

--- src/sys/net/bridge.c.orig	2005-08-25 07:01:19.000000000 +0200
+++ src/sys/net/bridge.c	2008-04-26 13:01:29.000000000 +0200
@@ -1119,7 +1119,7 @@
 	    }
 
 	    args.oif = real_dst;
-	    ip_dn_io_ptr(m, DN_TO_BDG_FWD, &args);
+	    ip_dn_io_ptr(&m, DN_TO_BDG_FWD, &args);
 	    return m0;
 	}
 	/*


>Release-Note:
>Audit-Trail:
>Unformatted: