From 1efbdcd10fb73c2eae83c5dbbb8f01c05b418403 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Mon, 25 Nov 2002 20:00:13 +0000 Subject: Fix IFF_ALLMULTI handling. Reviewed by: pdeuskar (maintainer) Approved by: re --- sys/dev/em/if_em.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sys') diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index 146d44f38d2cc..e8f36725eec97 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -529,14 +529,14 @@ em_ioctl(struct ifnet *ifp, IOCTL_CMD_TYPE command, caddr_t data) case SIOCSIFFLAGS: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); if (ifp->if_flags & IFF_UP) { - if (ifp->if_flags & IFF_RUNNING && - ifp->if_flags & IFF_PROMISC) { - em_set_promisc(adapter); - } else if (ifp->if_flags & IFF_RUNNING && - !(ifp->if_flags & IFF_PROMISC)) { - em_disable_promisc(adapter); - } else + /* + * init adapter if not running, then take care + * of possible changes in IFF_ALLMULTI and IFF_PROMISC + */ + if (!(ifp->if_flags & IFF_RUNNING)) em_init(adapter); + em_disable_promisc(adapter); + em_set_promisc(adapter); } else { if (ifp->if_flags & IFF_RUNNING) { em_stop(adapter); -- cgit v1.3