From owner-svn-src-stable-10@freebsd.org  Wed Jul 15 16:57:41 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 F10CB9A22D9;
 Wed, 15 Jul 2015 16:57:41 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 E039E11F5;
 Wed, 15 Jul 2015 16:57:41 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from svnmir.geo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6FGvfZc059394;
 Wed, 15 Jul 2015 16:57:41 GMT (envelope-from pkelsey@FreeBSD.org)
Received: (from pkelsey@localhost)
 by svnmir.geo.freebsd.org (8.14.9/8.14.9/Submit) id t6FGvffV059393;
 Wed, 15 Jul 2015 16:57:41 GMT (envelope-from pkelsey@FreeBSD.org)
Message-Id: <201507151657.t6FGvffV059393@svnmir.geo.freebsd.org>
X-Authentication-Warning: svnmir.geo.freebsd.org: pkelsey set sender to
 pkelsey@FreeBSD.org using -f
From: Patrick Kelsey <pkelsey@FreeBSD.org>
Date: Wed, 15 Jul 2015 16:57:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r285605 - stable/10/sys/net
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jul 2015 16:57:42 -0000

Author: pkelsey
Date: Wed Jul 15 16:57:40 2015
New Revision: 285605
URL: https://svnweb.freebsd.org/changeset/base/285605

Log:
  MFC r285190:
  
  Fix if_loop so bpfwrite() can use it regardless of the state of
  bd_hdrcmplt.  As if_loop does not use link-level headers, its behavior
  when used by bpfwrite() should be the same regardless of the state of
  bd_hdrcmplt.  Without this change, libpcap (and other BPF users that
  work like it) fail when writing to loopback interfaces.
  
  Approved by: re

Modified:
  stable/10/sys/net/if_loop.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net/if_loop.c
==============================================================================
--- stable/10/sys/net/if_loop.c	Wed Jul 15 16:55:56 2015	(r285604)
+++ stable/10/sys/net/if_loop.c	Wed Jul 15 16:57:40 2015	(r285605)
@@ -241,7 +241,7 @@ looutput(struct ifnet *ifp, struct mbuf 
 	ifp->if_obytes += m->m_pkthdr.len;
 
 	/* BPF writes need to be handled specially. */
-	if (dst->sa_family == AF_UNSPEC)
+	if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT)
 		bcopy(dst->sa_data, &af, sizeof(af));
 	else
 		af = dst->sa_family;