From owner-svn-src-head@freebsd.org  Sat Sep 24 13:23:48 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE523BE7BF0;
 Sat, 24 Sep 2016 13:23:48 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8EE47F6B;
 Sat, 24 Sep 2016 13:23:48 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8ODNlH0093070;
 Sat, 24 Sep 2016 13:23:47 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8ODNlqv093068;
 Sat, 24 Sep 2016 13:23:47 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201609241323.u8ODNlqv093068@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 24 Sep 2016 13:23:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306295 - head/sys/dev/cxgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Sep 2016 13:23:48 -0000

Author: np
Date: Sat Sep 24 13:23:47 2016
New Revision: 306295
URL: https://svnweb.freebsd.org/changeset/base/306295

Log:
  cxgbe(4): Support SIOGIFXMEDIA so that ifconfig displays correct media
  for 25Gbps and 100Gbps ports.   This should have been part of r305713,
  which is when the driver first started reporting extended media types.

Modified:
  head/sys/dev/cxgbe/t4_main.c
  head/sys/dev/cxgbe/t4_tracer.c

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Sat Sep 24 10:34:35 2016	(r306294)
+++ head/sys/dev/cxgbe/t4_main.c	Sat Sep 24 13:23:47 2016	(r306295)
@@ -1737,6 +1737,7 @@ fail:
 
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
+	case SIOCGIFXMEDIA:
 		ifmedia_ioctl(ifp, ifr, &vi->media, cmd);
 		break;
 

Modified: head/sys/dev/cxgbe/t4_tracer.c
==============================================================================
--- head/sys/dev/cxgbe/t4_tracer.c	Sat Sep 24 10:34:35 2016	(r306294)
+++ head/sys/dev/cxgbe/t4_tracer.c	Sat Sep 24 13:23:47 2016	(r306295)
@@ -472,6 +472,7 @@ tracer_ioctl(struct ifnet *ifp, unsigned
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
+	case SIOCGIFXMEDIA:
 		sx_xlock(&t4_trace_lock);
 		sc = ifp->if_softc;
 		if (sc == NULL)