From owner-svn-src-stable-11@freebsd.org  Sat Mar 17 18:55:47 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D34FF6087D;
 Sat, 17 Mar 2018 18:55:47 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 23473699A9;
 Sat, 17 Mar 2018 18:55:47 +0000 (UTC) (envelope-from dim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B9F41628E;
 Sat, 17 Mar 2018 18:55:47 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2HItkLH010299;
 Sat, 17 Mar 2018 18:55:46 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HItkpb010298;
 Sat, 17 Mar 2018 18:55:46 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201803171855.w2HItkpb010298@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 17 Mar 2018 18:55:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r331107 - stable/11/sys/net
X-SVN-Group: stable-11
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: stable/11/sys/net
X-SVN-Commit-Revision: 331107
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Mar 2018 18:55:47 -0000

Author: dim
Date: Sat Mar 17 18:55:46 2018
New Revision: 331107
URL: https://svnweb.freebsd.org/changeset/base/331107

Log:
  Repair obvious mismerge in r330897, resulting in misleading gcc error
  messages like "sys/net/if_fddisubr.c:1: error: expected '=', ',', ';',
  'asm' or '__attribute__' before '-' token".

Modified:
  stable/11/sys/net/if_fddisubr.c

Modified: stable/11/sys/net/if_fddisubr.c
==============================================================================
--- stable/11/sys/net/if_fddisubr.c	Sat Mar 17 18:14:49 2018	(r331106)
+++ stable/11/sys/net/if_fddisubr.c	Sat Mar 17 18:55:46 2018	(r331107)
@@ -1,6 +1,6 @@
+/*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
-/*-
  * Copyright (c) 1995, 1996
  *	Matt Thomas <matt@3am-software.com>.  All rights reserved.
  * Copyright (c) 1982, 1989, 1993