Module Name: src
Committed By: ozaki-r
Date: Mon Jun 23 06:27:58 UTC 2014
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Get rid of unnecessary xc_broadcast after pktq_barrier
Pointed out by rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/net/if_bridge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.83 src/sys/net/if_bridge.c:1.84
--- src/sys/net/if_bridge.c:1.83 Wed Jun 18 10:51:03 2014
+++ src/sys/net/if_bridge.c Mon Jun 23 06:27:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.83 2014/06/18 10:51:03 ozaki-r Exp $ */
+/* $NetBSD: if_bridge.c,v 1.84 2014/06/23 06:27:58 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.83 2014/06/18 10:51:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.84 2014/06/23 06:27:58 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -100,7 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_bridge.c,
#include <sys/kauth.h>
#include <sys/cpu.h>
#include <sys/cprng.h>
-#include <sys/xcall.h>
#include <net/bpf.h>
#include <net/if.h>
@@ -406,12 +405,9 @@ bridge_clone_destroy(struct ifnet *ifp)
struct bridge_softc *sc = ifp->if_softc;
struct bridge_iflist *bif;
int s;
- uint64_t xc;
/* Must be called during IFF_RUNNING, i.e., before bridge_stop */
pktq_barrier(sc->sc_fwd_pktq);
- xc = xc_broadcast(0, (xcfunc_t)nullop, NULL, NULL);
- xc_wait(xc);
s = splnet();
