Re: OpenOSPF6d does not send LSAs for passive interfaces
this works great for me. i'll pressure claudio@ to have a look at it over the
next week or two.
cheers,
dlg
On 25/04/2011, at 8:44 PM, Patrick Coleman wrote:
On Wed, Jan 5, 2011 at 8:32 PM, Jan Johansson janj+open...@wenf.org
wrote:
So I found a bug here.
Your mk2 patch (didn't try the mk1) does not advertise gif
tunnels this works with the unpatched binary.
Apologies for the delay on this one - finally got around to setting up
a test environment today. See [1] for an updated patch.
I've reworked the logic a bit (basically, it wasn't correctly dealing
with interfaces with unknown physical link states before). I've tested
the patch and it works with CARP and loopback interfaces, and gif
interfaces should work the same.
Comments appreciated.
Cheers,
Patrick
1. Also uploaded to
http://patrick.ld.net.au/ospf6d-fix-passive-interfaces-mk3.patch
Index: interface.c
===
RCS file: /cvs/src/usr.sbin/ospf6d/interface.c,v
retrieving revision 1.15
diff -u -p -r1.15 interface.c
--- interface.c 20 Sep 2009 20:45:06 - 1.15
+++ interface.c 25 Apr 2011 10:35:00 -
@@ -145,11 +145,15 @@ if_fsm(struct iface *iface, enum iface_e
if (iface-state != old_state) {
orig_rtr_lsa(iface);
orig_link_lsa(iface);
-
- /* state change inform RDE */
- ospfe_imsg_compose_rde(IMSG_IFINFO,
- iface-self-peerid, 0, iface, sizeof(struct iface));
}
+
+ /*
+ * Send interface update to RDE regardless of whether state changes - a
+ * passive interface will remain in the DOWN state but may need to have
+ * prefix LSAs sent regardless.
+ */
+ ospfe_imsg_compose_rde(IMSG_IFINFO,
+ iface-self-peerid, 0, iface, sizeof(struct iface));
if (old_state (IF_STA_MULTI | IF_STA_POINTTOPOINT)
(iface-state (IF_STA_MULTI | IF_STA_POINTTOPOINT)) == 0)
Index: rde.c
===
RCS file: /cvs/src/usr.sbin/ospf6d/rde.c,v
retrieving revision 1.50
diff -u -p -r1.50 rde.c
--- rde.c 22 Aug 2010 20:55:10 - 1.50
+++ rde.c 25 Apr 2011 10:35:03 -
@@ -22,6 +22,7 @@
#include sys/socket.h
#include sys/queue.h
#include sys/param.h
+#include net/if_types.h
#include netinet/in.h
#include arpa/inet.h
#include err.h
@@ -587,11 +588,20 @@ rde_dispatch_imsg(int fd, short event, v
iface = if_find(ifp-ifindex);
if (iface == NULL)
fatalx(interface lost in rde);
- iface-flags = ifp-flags;
- iface-linkstate = ifp-linkstate;
iface-nh_reachable = ifp-nh_reachable;
- if (iface-state != ifp-state) {
+
+ /*
+ * Resend LSAs if interface flags change - carp/passive
interfaces
+ * can come up and down without changing state.
+ */
+ if ((iface-state != ifp-state) ||
+ (iface-linkstate != ifp-linkstate) ||
+ (iface-flags != ifp-flags)) {
+
iface-state = ifp-state;
+ iface-flags = ifp-flags;
+ iface-linkstate = ifp-linkstate;
+
area = area_find(rdeconf, iface-area_id);
if (!area)
fatalx(interface lost area);
@@ -1459,8 +1469,43 @@ orig_intra_lsa_rtr(struct area *area, st
numprefix = 0;
LIST_FOREACH(iface, area-iface_list, entry) {
- if (iface-state IF_STA_DOWN)
+ /*
+ * Do not send a LSA for interfaces that:
+ * - are down (kernel flags)
+ *
+ * - are not carp and have a physical link state of down,
excluding
+ *unknown interfaces: if an interface has a link state of
unknown
+ *then the driver supplies no information about the
physical link
+ *state
+ *
+ * - are carp and have a physical link state of down or
unknown: carp
+ *uses the DOWN state for the backup interface, and the
UNKNOWN link
+ *state if something broke
+ *
+ * - are in the down state, and are not [carp or marked as
passive]:
+ *carp and passive interfaces will always have an OSPF
state of
+ *DOWN.
+ *
+ * Note we recheck interface flags and link state here in
addition to
+ * if_act_* as passive interfaces can change link state while
remaining
+ * in IF_STA_DOWN.
+ */
+ if (!(iface-flags
Re: minor mount_ntfs cleanup
On Mon, Jun 27, 2011 at 06:15:15PM -0400, Kenneth R Westerback wrote:
On Mon, Jun 27, 2011 at 04:52:46PM -0400, Ted Unangst wrote:
The original porting effort left behind some unneeded bits.
I'm not going to encourage NTFS use by ok'ing it. But if I was, I
would.
Ken
Yep, Ok with me.
Index: mount_ntfs.c
===
RCS file: /cvs/src/sbin/mount_ntfs/mount_ntfs.c,v
retrieving revision 1.13
diff -u -r1.13 mount_ntfs.c
--- mount_ntfs.c27 Jun 2011 19:47:22 - 1.13
+++ mount_ntfs.c27 Jun 2011 20:51:26 -
@@ -34,39 +34,26 @@
* Id: mount_ntfs.c,v 1.1.1.1 1999/02/03 03:51:19 semenu Exp
*/
-#include sys/cdefs.h
#include sys/param.h
-#define NTFS
#include sys/mount.h
#include sys/stat.h
-#include ctype.h
+
#include err.h
-#include grp.h
-#include pwd.h
#include stdio.h
#include stdlib.h
#include string.h
#include sysexits.h
#include unistd.h
-#include util.h
#include mntopts.h
static const struct mntopt mopts[] = {
MOPT_STDOPTS,
-#ifdef MNT_GETARGS
- MOPT_GETARGS,
-#endif
{ NULL }
};
-#ifndef __dead2
-#define __dead2 __attribute__((__noreturn__))
-#endif
-
-static voidusage(void) __dead2;
-mode_t a_mask(char *);
-int main(int, char **);
+static __dead void usage(void);
+static mode_t a_mask(char *);
int
main(int argc, char *argv[])
@@ -77,7 +64,7 @@
char *dev, dir[MAXPATHLEN];
mntflags = set_gid = set_uid = set_mask = 0;
- (void)memset(args, '\0', sizeof(args));
+ memset(args, 0, sizeof(args));
while ((c = getopt(argc, argv, aiu:g:m:o:)) != -1) {
switch (c) {
@@ -102,15 +89,12 @@
case 'o':
getmntopts(optarg, mopts, mntflags);
break;
- case '?':
default:
usage();
break;
}
}
- mntflags |= MNT_RDONLY;
-
if (optind + 2 != argc)
usage();
@@ -119,7 +103,9 @@
err(1, realpath %s, argv[optind + 1]);
args.fspec = dev;
- args.export_info.ex_root = 65534; /* unchecked anyway on DOS fs */
+ args.export_info.ex_root = 65534; /* unchecked anyway on NTFS */
+
+ mntflags |= MNT_RDONLY;
if (mntflags MNT_RDONLY)
args.export_info.ex_flags = MNT_EXRDONLY;
else
@@ -138,18 +124,10 @@
if (mount(MOUNT_NTFS, dir, mntflags, args) 0)
err(EX_OSERR, %s on %s, dev, dir);
-#ifdef MNT_GETARGS
- if (mntflags MNT_GETARGS) {
- char buf[1024];
- (void)snprintb(buf, sizeof(buf), NTFS_MFLAG_BITS, args.flag);
- printf(uid=%d, gid=%d, mode=0%o, flags=%s\n, args.uid,
- args.gid, args.mode, buf);
- }
-#endif
- exit (0);
+ exit(0);
}
-mode_t
+static mode_t
a_mask(char *s)
{
int done, rv;
--
Cheers,
Jasper
Capable, generous men do not create victims, they nurture them.
Mercedes Sosa (55 álbumes) - Discografía mas Pendrive de regalo
1 La vozde la zafra 2 Maestros del folklore 3 Canciones con fundamento 4 Romance de la muerte de Juan Lavalle 5 Hermano 6 Yo no canto por cantar 7 Para cantarle a mi gente 8 Con sabor a Mercedes Sosa 9 Mujeres Argentinas 10 El grito de la tierra 11 Navidad con Mercedes Sosa 12 Homenaje a Violeta Parra 13 Hasta la victoria 14 Cantata sudamericana 15 Traigo un pueblo en mi voz 16 A que florezca mi pueblo 17 Nintilde;o de mantilde;ana 18 En direccion del viento 19 Mercedes Sosa interpreta a Atahualpa Yupanqui 20 O cio da terra 21 Si se calla el cantor 22 Serenata para la tierra de uno 23 A quien doy 24 Gravado ao vivo no Brasil 25 Mercedes Sosa en Argentina 26 Meeutsche Whelle 27 Varios - Voices of freedom concert 28 Como un pajaro libre 29 Mercedes Sosa 30 Recital 31 Sera posible el sur 32 Corazon americano 33 Vengo a ofrecer mi corazon 34 Mercedes Sosa '86 35 Mercedes sosa '87 36 Amigos mios 37 En vivo en Europa 38 30 antilde;os 39 Sino 40 Gestos de amor 41 Disco de Oro 42 Gracias a la vida 43 Escondido en mi pais 44 Alta fidelidad 45 Al despertar 46 Misa criolla 47 Acustico 48 Voz y sentimiento 49 Sosa Heredia Gieco Serenata para la tierra deuno - 50 Argentina quiere cantar - 51 O Melhor de- 52 Corazon libre - 53 Festival de la tonada -54 Cantora - 55 De mi
Re: alc(4) support for Atheros AR815x
2011/5/16 Stuart Henderson s...@spacehopper.org: So far, only had reports from L1C and the new devices (which is not the point of sending out this sort of diff). This is a fairly large diff and changes behaviour for existing devices. Has anyone with a currently-working L2C tested this to make sure it doesn't break their nic? Hi, I have a eeepc 1001pxd with Attansic Technology L2C working and this patch didn't break the nic. One problem: very slow connectioncan I help? try to make some tests? Latest snapshot of i386. Attached dmesg and pcidump. Best regards. Matteo Filippetto Domain /dev/pci0: 0:0:0: Intel Pineview DMI 0x: Vendor ID: 8086 Product ID: a010 0x0004: Command: 0006 Status ID: 2090 0x0008: Class: 06 Subclass: 00 Interface: 00 Revision: 00 0x000c: BIST: 00 Header Type: 00 Latency Timer: 00 Cache Line Size: 00 0x0010: BAR empty () 0x0014: BAR empty () 0x0018: BAR empty () 0x001c: BAR empty () 0x0020: BAR empty () 0x0024: BAR empty () 0x0028: Cardbus CIS: 0x002c: Subsystem Vendor ID: 1043 Product ID: 83ac 0x0030: Expansion ROM Base Address: 0x0038: 0x003c: Interrupt Pin: 00 Line: 00 Min Gnt: 00 Max Lat: 00 0x00e0: Capability 0x09: Vendor Specific 0:2:0: Intel Pineview Video 0x: Vendor ID: 8086 Product ID: a011 0x0004: Command: 0007 Status ID: 0090 0x0008: Class: 03 Subclass: 00 Interface: 00 Revision: 00 0x000c: BIST: 00 Header Type: 80 Latency Timer: 00 Cache Line Size: 00 0x0010: BAR mem 32bit addr: 0xf7e0/0x0008 0x0014: BAR io addr: 0xdc00/0x0008 0x0018: BAR mem prefetchable 32bit addr: 0xd000/0x1000 0x001c: BAR mem 32bit addr: 0xf7d0/0x0010 0x0020: BAR empty () 0x0024: BAR empty () 0x0028: Cardbus CIS: 0x002c: Subsystem Vendor ID: 1043 Product ID: 83ac 0x0030: Expansion ROM Base Address: 0x0038: 0x003c: Interrupt Pin: 01 Line: 0f Min Gnt: 00 Max Lat: 00 0x0090: Capability 0x05: Message Signaled Interrupts (MSI) 0x00d0: Capability 0x01: Power Management 0:2:1: Intel Pineview Video 0x: Vendor ID: 8086 Product ID: a012 0x0004: Command: 0007 Status ID: 0090 0x0008: Class: 03 Subclass: 80 Interface: 00 Revision: 00 0x000c: BIST: 00 Header Type: 80 Latency Timer: 00 Cache Line Size: 00 0x0010: BAR mem 32bit addr: 0xf7e8/0x0008 0x0014: BAR empty () 0x0018: BAR empty () 0x001c: BAR empty () 0x0020: BAR empty () 0x0024: BAR empty () 0x0028: Cardbus CIS: 0x002c: Subsystem Vendor ID: 1043 Product ID: 83ac 0x0030: Expansion ROM Base Address: 0x0038: 0x003c: Interrupt Pin: 00 Line: 00 Min Gnt: 00 Max Lat: 00 0x00d0: Capability 0x01: Power Management 0:27:0: Intel 82801GB HD Audio 0x: Vendor ID: 8086 Product ID: 27d8 0x0004: Command: 0006 Status ID: 0010 0x0008: Class: 04 Subclass: 03 Interface: 00 Revision: 02 0x000c: BIST: 00 Header Type: 00 Latency Timer: 00 Cache Line Size: 08 0x0010: BAR mem 64bit addr: 0xf7cf8000/0x4000 0x0018: BAR empty () 0x001c: BAR empty () 0x0020: BAR empty () 0x0024: BAR empty () 0x0028: Cardbus CIS: 0x002c: Subsystem Vendor ID: 1043 Product ID: 8442 0x0030: Expansion ROM Base Address: 0x0038: 0x003c: Interrupt Pin: 01 Line: 04 Min Gnt: 00 Max Lat: 00 0x0050: Capability 0x01: Power Management 0x0060: Capability 0x05: Message Signaled Interrupts (MSI) 0x0070: Capability 0x10: PCI Express 0:28:0: Intel 82801GB PCIE 0x: Vendor ID: 8086 Product ID: 27d0 0x0004: Command: 0104 Status ID: 0010 0x0008: Class: 06 Subclass: 04 Interface: 00 Revision: 02 0x000c: BIST: 00 Header Type: 81 Latency Timer: 00 Cache Line Size: 08 0x0010: 0x0014: 0x0018: Primary Bus: 0 Secondary Bus: 4 Subordinate Bus: 4 Secondary Latency Timer: 00 0x001c: I/O Base: f0 I/O Limit: 00 Secondary Status: 2000 0x0020: Memory Base: fff0 Memory Limit: 0x0024: Prefetch Memory Base: fff1 Prefetch Memory Limit: 0001 0x0028: Prefetch Memory Base Upper 32 Bits: 0x002c: Prefetch Memory Limit Upper 32 Bits: 0x0030: I/O Base Upper 16 Bits: I/O Limit Upper 16 Bits: 0x0038: Expansion ROM Base Address: 0x003c: Interrupt Pin: 01 Line: 0f Bridge Control: 0002 0x0040: Capability 0x10:
fix gcc -rdynamic
The following fixes the gcc link spec so that gcc -rdynamic
will pass -export-dynamic to ld(1). export-dynamic/-E has
been a valid gnu ld option since 1994 and we use 2.15 everywhere
at the moment so this should be fine. objdump -T can
be used to easily test this.
This diff does not contain powerpc/rs6000 as it is
already in the spec there.
From http://gcc.gnu.org/onlinedocs/gcc/Link-Options.html
-rdynamic
Pass the flag -export-dynamic to the ELF linker, on targets that
support it. This instructs the linker to add all symbols, not only
used ones, to the dynamic symbol table. This option is needed for
some uses of dlopen or to allow obtaining backtraces from within a
program.
Index: egcs/gcc/config/sparc/openbsd.h
===
RCS file: /cvs/src/gnu/egcs/gcc/config/sparc/openbsd.h,v
retrieving revision 1.5
diff -u -p -r1.5 openbsd.h
--- egcs/gcc/config/sparc/openbsd.h 13 Jan 2006 17:51:18 - 1.5
+++ egcs/gcc/config/sparc/openbsd.h 28 Jun 2011 17:17:01 -
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA. */
%{shared:-shared} %{R*} \
%{static:-Bstatic} \
%{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
%{assert*} \
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}
Index: usr.bin/gcc/gcc/config/alpha/openbsd.h
===
RCS file: /cvs/src/gnu/usr.bin/gcc/gcc/config/alpha/openbsd.h,v
retrieving revision 1.10
diff -u -p -r1.10 openbsd.h
--- usr.bin/gcc/gcc/config/alpha/openbsd.h 2 Mar 2011 04:12:50 -
1.10
+++ usr.bin/gcc/gcc/config/alpha/openbsd.h 28 Jun 2011 17:17:02 -
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA. */
%{shared:-shared} %{R*} \
%{static:-Bstatic} \
%{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
%{assert*} \
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}
Index: usr.bin/gcc/gcc/config/arm/openbsd.h
===
RCS file: /cvs/src/gnu/usr.bin/gcc/gcc/config/arm/openbsd.h,v
retrieving revision 1.9
diff -u -p -r1.9 openbsd.h
--- usr.bin/gcc/gcc/config/arm/openbsd.h11 Nov 2008 23:48:19 -
1.9
+++ usr.bin/gcc/gcc/config/arm/openbsd.h28 Jun 2011 17:17:02 -
@@ -87,6 +87,7 @@ Boston, MA 02111-1307, USA. */
%{shared:-shared} %{R*} \
%{static:-Bstatic} \
%{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
%{assert*} \
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}
#endif
Index: usr.bin/gcc/gcc/config/sh/openbsd.h
===
RCS file: /cvs/src/gnu/usr.bin/gcc/gcc/config/sh/openbsd.h,v
retrieving revision 1.11
diff -u -p -r1.11 openbsd.h
--- usr.bin/gcc/gcc/config/sh/openbsd.h 16 Jun 2007 01:09:43 - 1.11
+++ usr.bin/gcc/gcc/config/sh/openbsd.h 28 Jun 2011 17:17:02 -
@@ -64,7 +64,13 @@ Boston, MA 02111-1307, USA. */
%{g:%{!nostdlib:-L/usr/lib/debug}} %{!nostdlib:%{!r*:%{!e*:-e __start}}}
-dc -dp %{assert*}
#else
#define SUBTARGET_LINK_SPEC \
- %{g:%{!nostdlib:-L/usr/lib/debug}} %{!shared:%{!nostdlib:%{!r*:%{!e*:-e
__start %{shared:-Bshareable -x} -dc -dp %{R*} %{static:-Bstatic}
%{assert*} %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}
+ %{g:%{!nostdlib:-L/usr/lib/debug}} \
+ %{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start \
+ %{shared:-Bshareable -x} -dc -dp %{R*} \
+ %{static:-Bstatic} \
+ %{rdynamic:-export-dynamic} \
+ %{assert*} \
+ %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}
#endif
Index: gcc/gcc/config/alpha/openbsd.h
===
RCS file: /cvs/src/gnu/gcc/gcc/config/alpha/openbsd.h,v
retrieving revision 1.3
diff -u -p -r1.3 openbsd.h
--- gcc/gcc/config/alpha/openbsd.h 12 May 2010 18:19:50 - 1.3
+++ gcc/gcc/config/alpha/openbsd.h 28 Jun 2011 17:17:05 -
@@ -31,6 +31,7 @@ Boston, MA 02110-1301, USA. */
%{shared:-shared} %{R*} \
%{static:-Bstatic} \
%{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
%{assert*} \
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}
Index: gcc/gcc/config/arm/openbsd.h
===
RCS file: /cvs/src/gnu/gcc/gcc/config/arm/openbsd.h,v
retrieving revision 1.3
diff -u -p -r1.3 openbsd.h
--- gcc/gcc/config/arm/openbsd.h25 Jun 2011 20:56:21 - 1.3
+++ gcc/gcc/config/arm/openbsd.h28 Jun 2011 17:17:05 -
@@ -72,6 +72,7 @@ Boston, MA 02111-1307, USA. */
%{shared:-shared} %{R*} \
%{static:-Bstatic} \
%{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
%{assert*} \
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}
#endif
Index: gcc/gcc/config/i386/openbsd64.h
===
RCS file: /cvs/src/gnu/gcc/gcc/config/i386/openbsd64.h,v
bridge interface search
This diff changes the if_bridge pointer of an interface (struct ifnet) to
not point to the bridge but to its own bridge interface configuration.
Should be safe because an interface can only be part of one bridge.
This way all the LIST_FOREACH lineair searches in the bridge code can be
replaced. There are also two of those in the forwarding path so this diff
should make the bridge faster, especially with lots of interfaces.
I've renamed it to if_bridge_port to smoke out all users and because
it's clearer. (my fingers itch to rename bridge_iflist too as noted in
the diff :-) )
Most of the diff is mechanical. The if_ether.c change got pretty hairy
though and could some more eyes.
And the whole thing could use some substantial testing...
Index: sys/dev/isa/if_ie.c
===
RCS file: /cvs/src/sys/dev/isa/if_ie.c,v
retrieving revision 1.35
diff -u -r1.35 if_ie.c
--- sys/dev/isa/if_ie.c 28 Nov 2008 02:44:17 - 1.35
+++ sys/dev/isa/if_ie.c 24 Jun 2011 18:29:18 -
@@ -1054,16 +1054,16 @@
*/
#if NBPFILTER 0
*to_bpf = (sc-sc_arpcom.ac_if.if_bpf != 0) ||
- (sc-sc_arpcom.ac_if.if_bridge != NULL);
+ (sc-sc_arpcom.ac_if.if_bridge_port != NULL);
#else
- *to_bpf = (sc-sc_arpcom.ac_if.if_bridge != NULL);
+ *to_bpf = (sc-sc_arpcom.ac_if.if_bridge_port != NULL);
#endif
/* If for us, accept and hand up to BPF */
if (ether_equal(eh-ether_dhost, sc-sc_arpcom.ac_enaddr))
return 1;
#if NBPFILTER 0
- if (*to_bpf sc-sc_arpcom.ac_if.if_bridge == NULL)
+ if (*to_bpf sc-sc_arpcom.ac_if.if_bridge_port == NULL)
*to_bpf = 2; /* we don't need to see it */
#endif
@@ -1095,9 +1095,9 @@
*/
#if NBPFILTER 0
*to_bpf = (sc-sc_arpcom.ac_if.if_bpf != 0) ||
- (sc-sc_arpcom.ac_if.if_bridge != NULL);
+ (sc-sc_arpcom.ac_if.if_bridge_port != NULL);
#else
- *to_bpf = (sc-sc_arpcom.ac_if.if_bridge != NULL);
+ *to_bpf = (sc-sc_arpcom.ac_if.if_bridge_port != NULL);
#endif
/* We want to see multicasts. */
if (eh-ether_dhost[0] 1)
@@ -1109,7 +1109,7 @@
/* Anything else goes to BPF but nothing else. */
#if NBPFILTER 0
- if (*to_bpf sc-sc_arpcom.ac_if.if_bridge == NULL)
+ if (*to_bpf sc-sc_arpcom.ac_if.if_bridge_port == NULL)
*to_bpf = 2;
#endif
return 1;
Index: sys/net/bridgestp.c
===
RCS file: /cvs/src/sys/net/bridgestp.c,v
retrieving revision 1.39
diff -u -r1.39 bridgestp.c
--- sys/net/bridgestp.c 20 Nov 2010 14:23:09 - 1.39
+++ sys/net/bridgestp.c 24 Jun 2011 18:29:18 -
@@ -1644,7 +1644,7 @@
if (ifp-if_type == IFT_BRIDGE)
return;
- sc = (struct bridge_softc *)ifp-if_bridge;
+ sc = ((struct bridge_iflist *)ifp-if_bridge_port)-bridge_sc;
s = splnet();
LIST_FOREACH(p, sc-sc_iflist, next) {
@@ -2133,15 +2133,8 @@
err = ENOENT;
break;
}
- if ((caddr_t)sc != ifs-if_bridge) {
- err = ESRCH;
- break;
- }
- LIST_FOREACH(p, sc-sc_iflist, next) {
- if (p-ifp == ifs)
- break;
- }
- if (p == LIST_END(sc-sc_iflist)) {
+ p = (struct bridge_iflist *)ifs-if_bridge_port;
+ if (p == NULL || p-bridge_sc != sc) {
err = ESRCH;
break;
}
Index: sys/net/if.c
===
RCS file: /cvs/src/sys/net/if.c,v
retrieving revision 1.234
diff -u -r1.234 if.c
--- sys/net/if.c13 Mar 2011 15:31:41 - 1.234
+++ sys/net/if.c24 Jun 2011 18:29:18 -
@@ -531,7 +531,7 @@
#if NBRIDGE 0
/* Remove the interface from any bridge it is part of. */
- if (ifp-if_bridge)
+ if (ifp-if_bridge_port)
bridge_ifdetach(ifp);
#endif
@@ -1101,7 +1101,7 @@
carp_carpdev_state(ifp);
#endif
#if NBRIDGE 0
- if (ifp-if_bridge)
+ if (ifp-if_bridge_port)
bstp_ifstate(ifp);
#endif
rt_ifmsg(ifp);
@@ -1137,7 +1137,7 @@
carp_carpdev_state(ifp);
#endif
#if NBRIDGE 0
- if (ifp-if_bridge)
+ if (ifp-if_bridge_port)
bstp_ifstate(ifp);
#endif
rt_ifmsg(ifp);
Index: sys/net/if.h
===
RCS file: /cvs/src/sys/net/if.h,v
retrieving revision 1.122
diff -u -r1.122 if.h
---
Re: notyet, notever
On 2011/06/28 15:05, Ted Unangst wrote: if pss(4) mpu support, or wdc isapnp support, or whatever else isn't done yet in isa/, i'm officially betting it's not getting done. atticize. Index: pss.c FWIW, there are even fewer pss(4) in dmesglog than mcd(4).. (i.e. none, the only entries are from pasted-in kernel config files).
Re: ansi in uvm and kern
Also, for uvm, please ask ariane and oga specifically if it causes them pain (because they both have big diffs)
