version 1.372, 2017/01/20 08:35:33 |
version 1.373, 2017/01/23 10:19:03 |
Line 526 if_activate_sadl(struct ifnet *ifp, stru |
|
Line 526 if_activate_sadl(struct ifnet *ifp, stru |
|
struct ifaddr *ifa; |
struct ifaddr *ifa; |
int bound = curlwp_bind(); |
int bound = curlwp_bind(); |
|
|
s = splnet(); |
s = splsoftnet(); |
|
|
if_deactivate_sadl(ifp); |
if_deactivate_sadl(ifp); |
|
|
Line 567 if_free_sadl(struct ifnet *ifp) |
|
Line 567 if_free_sadl(struct ifnet *ifp) |
|
|
|
KASSERT(ifp->if_sadl != NULL); |
KASSERT(ifp->if_sadl != NULL); |
|
|
s = splnet(); |
s = splsoftnet(); |
rtinit(ifa, RTM_DELETE, 0); |
rtinit(ifa, RTM_DELETE, 0); |
ifa_remove(ifp, ifa); |
ifa_remove(ifp, ifa); |
if_deactivate_sadl(ifp); |
if_deactivate_sadl(ifp); |
Line 1126 if_attachdomain1(struct ifnet *ifp) |
|
Line 1126 if_attachdomain1(struct ifnet *ifp) |
|
struct domain *dp; |
struct domain *dp; |
int s; |
int s; |
|
|
s = splnet(); |
s = splsoftnet(); |
|
|
/* address family dependent data region */ |
/* address family dependent data region */ |
memset(ifp->if_afdata, 0, sizeof(ifp->if_afdata)); |
memset(ifp->if_afdata, 0, sizeof(ifp->if_afdata)); |
Line 1148 if_deactivate(struct ifnet *ifp) |
|
Line 1148 if_deactivate(struct ifnet *ifp) |
|
{ |
{ |
int s; |
int s; |
|
|
s = splnet(); |
s = splsoftnet(); |
|
|
ifp->if_output = if_nulloutput; |
ifp->if_output = if_nulloutput; |
ifp->_if_input = if_nullinput; |
ifp->_if_input = if_nullinput; |
Line 2450 if_slowtimo(void *arg) |
|
Line 2450 if_slowtimo(void *arg) |
|
if (__predict_false(slowtimo == NULL)) |
if (__predict_false(slowtimo == NULL)) |
return; |
return; |
|
|
s = splnet(); |
s = splsoftnet(); |
if (ifp->if_timer != 0 && --ifp->if_timer == 0) |
if (ifp->if_timer != 0 && --ifp->if_timer == 0) |
(*slowtimo)(ifp); |
(*slowtimo)(ifp); |
|
|
Line 2720 ifioctl_common(struct ifnet *ifp, u_long |
|
Line 2720 ifioctl_common(struct ifnet *ifp, u_long |
|
case SIOCSIFFLAGS: |
case SIOCSIFFLAGS: |
ifr = data; |
ifr = data; |
if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) { |
if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) { |
s = splnet(); |
s = splsoftnet(); |
if_down(ifp); |
if_down(ifp); |
splx(s); |
splx(s); |
} |
} |
if (ifr->ifr_flags & IFF_UP && (ifp->if_flags & IFF_UP) == 0) { |
if (ifr->ifr_flags & IFF_UP && (ifp->if_flags & IFF_UP) == 0) { |
s = splnet(); |
s = splsoftnet(); |
if_up(ifp); |
if_up(ifp); |
splx(s); |
splx(s); |
} |
} |
Line 3026 doifioctl(struct socket *so, u_long cmd, |
|
Line 3026 doifioctl(struct socket *so, u_long cmd, |
|
|
|
if (((oif_flags ^ ifp->if_flags) & IFF_UP) != 0) { |
if (((oif_flags ^ ifp->if_flags) & IFF_UP) != 0) { |
if ((ifp->if_flags & IFF_UP) != 0) { |
if ((ifp->if_flags & IFF_UP) != 0) { |
int s = splnet(); |
int s = splsoftnet(); |
if_up(ifp); |
if_up(ifp); |
splx(s); |
splx(s); |
} |
} |