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



details:   https://anonhg.NetBSD.org/src/rev/e7319ec59229
branches:  trunk
changeset: 821679:e7319ec59229
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Feb 13 04:05:19 2017 +0000

description:
Remove unnecessary splnet

ok @knakahara

diffstat:

 sys/net/if_gif.c |  22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

diffs (70 lines):

diff -r cf2c22f0caf8 -r e7319ec59229 sys/net/if_gif.c
--- a/sys/net/if_gif.c  Mon Feb 13 04:01:11 2017 +0000
+++ b/sys/net/if_gif.c  Mon Feb 13 04:05:19 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.124 2016/12/14 11:19:15 knakahara Exp $   */
+/*     $NetBSD: if_gif.c,v 1.125 2017/02/13 04:05:19 ozaki-r Exp $     */
 /*     $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $    */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.124 2016/12/14 11:19:15 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.125 2017/02/13 04:05:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -448,22 +448,13 @@
        struct mbuf *m;
        int family;
        int len;
-#ifndef GIF_MPSAFE
-       int s;
-#endif
        int error;
 
        sc = ifp->if_softc;
 
        /* output processing */
        while (1) {
-#ifndef GIF_MPSAFE
-               s = splnet();
-#endif
                IFQ_DEQUEUE(&sc->gif_if.if_snd, m);
-#ifndef GIF_MPSAFE
-               splx(s);
-#endif
                if (m == NULL)
                        break;
 
@@ -587,9 +578,6 @@
 {
        pktqueue_t *pktq;
        size_t pktlen;
-#ifndef GIF_MPSAFE
-       int s;
-#endif
 
        if (ifp == NULL) {
                /* just in case */
@@ -624,18 +612,12 @@
                return;
        }
 
-#ifndef GIF_MPSAFE
-       s = splnet();
-#endif
        if (__predict_true(pktq_enqueue(pktq, m, 0))) {
                ifp->if_ibytes += pktlen;
                ifp->if_ipackets++;
        } else {
                m_freem(m);
        }
-#ifndef GIF_MPSAFE
-       splx(s);
-#endif
 }
 
 /* XXX how should we handle IPv6 scope on SIOC[GS]IFPHYADDR? */



Home | Main Index | Thread Index | Old Index