Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Feb 2011 21:27:46 +0000 (UTC)
From:      Pyun YongHyeon <yongari@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r218963 - stable/7/sys/dev/fxp
Message-ID:  <201102222127.p1MLRk2Z021986@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yongari
Date: Tue Feb 22 21:27:46 2011
New Revision: 218963
URL: http://svn.freebsd.org/changeset/base/218963

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/7/sys/dev/fxp/if_fxp.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/fxp/if_fxp.c
==============================================================================
--- stable/7/sys/dev/fxp/if_fxp.c	Tue Feb 22 21:24:36 2011	(r218962)
+++ stable/7/sys/dev/fxp/if_fxp.c	Tue Feb 22 21:27:46 2011	(r218963)
@@ -2816,8 +2816,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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102222127.p1MLRk2Z021986>