Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net Remove unnecessary splnet for bridge_enqueue



details:   https://anonhg.NetBSD.org/src/rev/8e97898cdf05
branches:  trunk
changeset: 822206:8e97898cdf05
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue Mar 07 01:53:53 2017 +0000

description:
Remove unnecessary splnet for bridge_enqueue

bridge_enqueue now uses if_transmit_lock that does splnet for device
drivers, so splnet for bridge_enqueue isn't needed anymore.

diffstat:

 sys/net/if_bridge.c |  16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diffs (46 lines):

diff -r 2cd43e51dfb9 -r 8e97898cdf05 sys/net/if_bridge.c
--- a/sys/net/if_bridge.c       Tue Mar 07 01:32:03 2017 +0000
+++ b/sys/net/if_bridge.c       Tue Mar 07 01:53:53 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bridge.c,v 1.133 2017/02/16 08:12:44 knakahara Exp $        */
+/*     $NetBSD: if_bridge.c,v 1.134 2017/03/07 01:53:53 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.133 2017/02/16 08:12:44 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134 2017/03/07 01:53:53 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -1522,13 +1522,7 @@
                                }
                        }
 
-#ifndef NET_MPSAFE
-                       s = splnet();
-#endif
                        bridge_enqueue(sc, dst_if, mc, 0);
-#ifndef NET_MPSAFE
-                       splx(s);
-#endif
 
                        if ((m->m_flags & (M_MCAST | M_BCAST)) != 0 &&
                            dst_if != ifp)
@@ -1585,13 +1579,7 @@
                return (0);
        }
 
-#ifndef NET_MPSAFE
-       s = splnet();
-#endif
        bridge_enqueue(sc, dst_if, m, 0);
-#ifndef NET_MPSAFE
-       splx(s);
-#endif
 
        return (0);
 }



Home | Main Index | Thread Index | Old Index