From 9f1d56691ca1f1a273fe41709ac162ebbb31dcb4 Mon Sep 17 00:00:00 2001
From: arybchik <arybchik@FreeBSD.org>
Date: Thu, 14 Jan 2016 15:07:02 +0000
Subject: MFC r291843

sfxge: support for MCDI logging implemented

Submitted by:   Artem V. Andreev <Artem.Andreev at oktetlabs.ru>
Sponsored by:   Solarflare Communications, Inc.
---
 share/man/man4/sfxge.4 | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'share')

diff --git a/share/man/man4/sfxge.4 b/share/man/man4/sfxge.4
index c6319fc..b924986 100644
--- a/share/man/man4/sfxge.4
+++ b/share/man/man4/sfxge.4
@@ -148,6 +148,14 @@ Number of packets with payload that must arrive in-order following loss
 before a connection is eligible for LRO.
 The idea is we should avoid coalescing segments when the sender is recovering
 from loss, because reducing the ACK rate can damage performance.
+.It Va hw.sfxge.mcdi_logging
+Enable logging of MCDI protocol messages  (only available if enabled at compile-time).
+.It Va hw.sfxge.N.mcdi_logging
+Enable or disable logging of MCDI protocol messages on a per-port basis. The default for each
+port will be the value of
+.Va hw.sfxge.mcdi_logging.
+The logging may also be enabled or disabled after the driver is loaded using the sysctl
+.Va dev.sfxge.%d.mcdi_logging.
 .El
 .Sh SUPPORT
 For general information and support,
-- 
cgit v1.1


From 2287ea2801aa73a1c946659b4dbf5dc74a86c72b Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Thu, 14 Jan 2016 21:53:06 +0000
Subject: Fix SRCTOP assignment for fmake.

This corrects r292239 which incorrectly used a bmake feature for the fmake
logic.

Sponsored by:	EMC / Isilon Storage Division
---
 share/mk/local.sys.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share')

diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index d379e8f..b54e622 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -3,7 +3,7 @@
 .if defined(.PARSEDIR)
 SRCTOP:= ${.PARSEDIR:tA:H:H}
 .else
-SRCTOP:= ${.MAKE.MAKEFILES:M*/local.sys.mk:H:H:H}
+SRCTOP:= ${.MAKEFILE_LIST:M*/local.sys.mk:H:H:H}
 .endif
 
 .if ${.CURDIR} == ${SRCTOP}
-- 
cgit v1.1


From ea17ab405c36eba3e05190a8ee8614ece10475b2 Mon Sep 17 00:00:00 2001
From: smh <smh@FreeBSD.org>
Date: Fri, 15 Jan 2016 02:14:49 +0000
Subject: MFC r274503:

Add OBJDUMP to sys.mk.

Sponsored by:	Multiplay
---
 share/mk/sys.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'share')

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 96cdc72..0afbbd5 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -144,6 +144,8 @@ OBJCFLAGS	?=	${OBJCINCLUDES} ${CFLAGS} -Wno-import
 
 OBJCOPY		?=	objcopy
 
+OBJDUMP		?=	objdump
+
 PC		?=	pc
 PFLAGS		?=
 
-- 
cgit v1.1