svn commit: r218962 - stable/8/sys/dev/fxp

Pyun YongHyeon yongari at FreeBSD.org
Tue Feb 22 21:24:37 UTC 2011


Author: yongari
Date: Tue Feb 22 21:24:36 2011
New Revision: 218962
URL: http://svn.freebsd.org/changeset/base/218962

Log:
  MFC r218710:
    Fix a regression introduced in r215906. The change made in r215906
    caused link re-negotiation whenever application joins or leaves a
    multicast group.  If driver is running, it would have established a
    link so there is no need to start re-negotiation. The re-negotiation
    broke established link which in turn stopped multicast application
    working while re-negotiation is in progress.
  
    PR:	kern/154667

Modified:
  stable/8/sys/dev/fxp/if_fxp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/fxp/if_fxp.c
==============================================================================
--- stable/8/sys/dev/fxp/if_fxp.c	Tue Feb 22 21:13:40 2011	(r218961)
+++ stable/8/sys/dev/fxp/if_fxp.c	Tue Feb 22 21:24:36 2011	(r218962)
@@ -2823,8 +2823,10 @@ fxp_ioctl(struct ifnet *ifp, u_long comm
 
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
+		FXP_LOCK(sc);
 		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
-			fxp_init(sc);
+			fxp_init_body(sc, 0);
+		FXP_UNLOCK(sc);
 		break;
 
 	case SIOCSIFMEDIA:


More information about the svn-src-stable-8 mailing list