diff options
author | jhb <jhb@FreeBSD.org> | 2001-11-14 18:36:37 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2001-11-14 18:36:37 +0000 |
commit | 866e8e774b05729a229b02750f88c34a58caac8e (patch) | |
tree | c94ee5845b912877c84cbff04313feb143f0d7b4 /sys | |
parent | 08704afd447096c2834699aec78e39c3a53a471a (diff) | |
download | FreeBSD-src-866e8e774b05729a229b02750f88c34a58caac8e.zip FreeBSD-src-866e8e774b05729a229b02750f88c34a58caac8e.tar.gz |
Remove ifnet.if_mpsafe for now. If this is needed, it won't be needed
until much later when the network stack locking is farther along.
Approved by: jlemon
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/dc/if_dc.c | 1 | ||||
-rw-r--r-- | sys/net/if_var.h | 10 | ||||
-rw-r--r-- | sys/pci/if_dc.c | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index d887464..4592c29 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -2060,7 +2060,6 @@ static int dc_attach(dev) ifp->if_init = dc_init; ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = DC_TX_LIST_CNT - 1; - ifp->if_mpsafe = IS_MPSAFE; /* * Do MII setup. If this is a 21143, check for a PHY on the diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 2738c36..9797d90 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -125,7 +125,6 @@ struct ifnet { short if_flags; /* up/down, broadcast, etc. */ int if_capabilities; /* interface capabilities */ int if_capenable; /* enabled features */ - int if_mpsafe; /* XXX TEMPORARY */ int if_ipending; /* interrupts pending */ void *if_linkmib; /* link-type-specific MIB data */ size_t if_linkmiblen; /* length of above data */ @@ -292,15 +291,8 @@ if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp, int adjust) } _IF_ENQUEUE(ifq, m); IF_UNLOCK(ifq); - if (ifp != NULL && !active) { - if (ifp->if_mpsafe) { - DROP_GIANT_NOSWITCH(); + if (ifp != NULL && !active) (*ifp->if_start)(ifp); - PICKUP_GIANT(); - } else { - (*ifp->if_start)(ifp); - } - } return (1); } diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index d887464..4592c29 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -2060,7 +2060,6 @@ static int dc_attach(dev) ifp->if_init = dc_init; ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = DC_TX_LIST_CNT - 1; - ifp->if_mpsafe = IS_MPSAFE; /* * Do MII setup. If this is a 21143, check for a PHY on the |