From owner-svn-src-stable-9@FreeBSD.ORG  Mon Oct  1 10:54:04 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF727106564A;
	Mon,  1 Oct 2012 10:54:04 +0000 (UTC)
	(envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A8D968FC19;
	Mon,  1 Oct 2012 10:54:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q91As4Ct032426;
	Mon, 1 Oct 2012 10:54:04 GMT (envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q91As4gr032424;
	Mon, 1 Oct 2012 10:54:04 GMT (envelope-from melifaro@svn.freebsd.org)
Message-Id: <201210011054.q91As4gr032424@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Mon, 1 Oct 2012 10:54:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241094 - stable/9/sys/ofed/drivers/infiniband/ulp/ipoib
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2012 10:54:04 -0000

Author: melifaro
Date: Mon Oct  1 10:54:04 2012
New Revision: 241094
URL: http://svn.freebsd.org/changeset/base/241094

Log:
  Merge r240082.
  
  Remove unneeded ipfw headers introduced in r213447 from Infiniband code.

Modified:
  stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
==============================================================================
--- stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h	Mon Oct  1 10:52:10 2012	(r241093)
+++ stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h	Mon Oct  1 10:54:04 2012	(r241094)
@@ -67,8 +67,6 @@
 #include <netinet/in_var.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip_var.h>
-#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
 #endif
 #ifdef INET6
 #include <netinet6/nd6.h>