svn commit: r218710 - head/sys/dev/fxp

[Pyun YongHyeon]

Author: yongari
Date: Tue Feb 15 18:16:04 2011
New Revision: 218710
URL: http://svn.freebsd.org/changeset/base/218710

Log:
  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
  MFC after:	1 week

Modified:
  head/sys/dev/fxp/if_fxp.c

Modified: head/sys/dev/fxp/if_fxp.c
==============================================================================
--- head/sys/dev/fxp/if_fxp.c	Tue Feb 15 16:09:08 2011	(r218709)
+++ head/sys/dev/fxp/if_fxp.c	Tue Feb 15 18:16:04 2011	(r218710)
@@ -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: