svn commit: r191929 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netinet

Xin LI delphij at FreeBSD.org
Sat May 9 00:35:41 UTC 2009


Author: delphij
Date: Sat May  9 00:35:38 2009
New Revision: 191929
URL: http://svn.freebsd.org/changeset/base/191929

Log:
  MFC r176093 (glebius):
  
  If the vhid already present, return EEXIST instead of
  non-informative EINVAL.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/ip_carp.c

Modified: stable/7/sys/netinet/ip_carp.c
==============================================================================
--- stable/7/sys/netinet/ip_carp.c	Fri May  8 23:47:49 2009	(r191928)
+++ stable/7/sys/netinet/ip_carp.c	Sat May  9 00:35:38 2009	(r191929)
@@ -1534,7 +1534,7 @@ carp_set_addr(struct carp_softc *sc, str
 		TAILQ_FOREACH(vr, &cif->vhif_vrs, sc_list)
 			if (vr != sc && vr->sc_vhid == sc->sc_vhid) {
 				CARP_UNLOCK(cif);
-				error = EINVAL;
+				error = EEXIST;
 				goto cleanup;
 			}
 	}


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