From owner-svn-src-head@FreeBSD.ORG  Sat Nov 13 22:40:37 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E582410656B1;
	Sat, 13 Nov 2010 22:40:37 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDE4B8FC16;
	Sat, 13 Nov 2010 22:40:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oADMebUq062452;
	Sat, 13 Nov 2010 22:40:37 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oADMebRk062450;
	Sat, 13 Nov 2010 22:40:37 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201011132240.oADMebRk062450@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 13 Nov 2010 22:40:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215272 - head/sbin/ifconfig
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Nov 2010 22:40:38 -0000

Author: marius
Date: Sat Nov 13 22:40:37 2010
New Revision: 215272
URL: http://svn.freebsd.org/changeset/base/215272

Log:
  When setting a media with no sub-type specified also reset the type
  specific options along with the global ones so these options don't
  stick when f.e. switching to IFM_AUTO.
  
  MFC after:	2 weeks

Modified:
  head/sbin/ifconfig/ifmedia.c

Modified: head/sbin/ifconfig/ifmedia.c
==============================================================================
--- head/sbin/ifconfig/ifmedia.c	Sat Nov 13 22:38:33 2010	(r215271)
+++ head/sbin/ifconfig/ifmedia.c	Sat Nov 13 22:40:37 2010	(r215272)
@@ -276,7 +276,7 @@ setmedia(const char *val, int d, int s, 
 	    IFM_TYPE(ifmr->ifm_ulist[0]) | subtype;
 
 	if ((ifr.ifr_media & IFM_TMASK) == 0) {
-		ifr.ifr_media &= ~IFM_GMASK;
+		ifr.ifr_media &= ~(IFM_GMASK | IFM_OMASK);
 	}
 
 	ifmr->ifm_current = ifr.ifr_media;