From owner-svn-ports-all@FreeBSD.ORG  Tue May 27 10:15:28 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ECE8AFF7;
 Tue, 27 May 2014 10:15:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 DA1B52795;
 Tue, 27 May 2014 10:15:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RAFSt3022839;
 Tue, 27 May 2014 10:15:28 GMT (envelope-from mich@svn.freebsd.org)
Received: (from mich@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RAFSIT022838;
 Tue, 27 May 2014 10:15:28 GMT (envelope-from mich@svn.freebsd.org)
Message-Id: <201405271015.s4RAFSIT022838@svn.freebsd.org>
From: Michael Landin Hostbaek <mich@FreeBSD.org>
Date: Tue, 27 May 2014 10:15:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355479 - head/net/slurm/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2014 10:15:29 -0000

Author: mich
Date: Tue May 27 10:15:28 2014
New Revision: 355479
URL: http://svnweb.freebsd.org/changeset/ports/355479
QAT: https://qat.redports.org/buildarchive/r355479/

Log:
  - Port net/slurm 0.3.3 does not display the interface speed correctly
  for at least some gigabit NICs (and, I suspect, all of them on FreeBSD).
  Specifically, I know it doesn't work for Intel gigabit NICs that i
  use the em(4) driver.
  
  This appears to be due to dodgy bitwise math in the upstream code.
  However, I note that the website given for the upstream code no
  longer appears to be working, so I'm not sure that there IS an
  upstream maintainer any longer.
  
  PR:		ports/190160
  Submitted by:	Rob Levandowski <robl@macwhiz.com>

Added:
  head/net/slurm/files/patch-src_if__media.c   (contents, props changed)

Added: head/net/slurm/files/patch-src_if__media.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/slurm/files/patch-src_if__media.c	Tue May 27 10:15:28 2014	(r355479)
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- src/if_media.c.orig
++++ src/if_media.c
+@@ -95,8 +95,13 @@
+      *
+      */
+ 
++#if __FreeBSD__ >= 2 
++    type = IFM_TYPE(ifmr.ifm_active);
++    physical = IFM_SUBTYPE(ifmr.ifm_active);
++#else
+     type = ifmr.ifm_active & 0xf0;
+     physical = ifmr.ifm_active & 0x0f;
++#endif
+ 
+ #ifdef MEDIADEBUG
+     printf("      all: %6d\n", ifmr.ifm_current);