From owner-freebsd-net@FreeBSD.ORG Thu Sep 1 19:04:53 2011 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C60E1065670 for ; Thu, 1 Sep 2011 19:04:53 +0000 (UTC) (envelope-from lacombar@gmail.com) Received: from mail-yw0-f54.google.com (mail-yw0-f54.google.com [209.85.213.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3DAAE8FC0A for ; Thu, 1 Sep 2011 19:04:52 +0000 (UTC) Received: by ywo32 with SMTP id 32so2083156ywo.13 for ; Thu, 01 Sep 2011 12:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=lFAJDfo5neVuqEzh+jtDVutLqkAGJA+k36JRcpLrx84=; b=YOB52Uqmu1ccRUwMqYIy8LTbV2Vb4cv7ydj3QHv9n5cE7vQ6M/Z4tjcHTv/JnntbOZ PWJfDupuXHu9ewDZC0nggYqlEgKgmX+QWp5R5nyOPMIPRlBQ4Pv5wQ2frdHvsczCl+vS Emzz3RYbcGYJ5Ky5zd8/JW765yXDgB6TBo78s= Received: by 10.151.5.2 with SMTP id h2mr387569ybi.127.1314903892460; Thu, 01 Sep 2011 12:04:52 -0700 (PDT) Received: from localhost.localdomain (69-165-142-232.dsl.teksavvy.com [69.165.142.232]) by mx.google.com with ESMTPS id u31sm190225ybu.9.2011.09.01.12.04.50 (version=SSLv3 cipher=OTHER); Thu, 01 Sep 2011 12:04:51 -0700 (PDT) From: Arnaud Lacombe To: freebsd-net@freebsd.org Date: Thu, 1 Sep 2011 15:04:34 -0400 Message-Id: <1314903874-27581-1-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.6.153.g78432 Cc: Jack Vogel , Arnaud Lacombe Subject: [PATCH] Fix igb(4) build on 7-STABLE X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Sep 2011 19:04:53 -0000 Driver from HEAD missed to isolate a variable. Cc: Jack Vogel Signed-off-by: Arnaud Lacombe --- sys/dev/e1000/if_igb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index cbf4d23..7fb2da0 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -2235,7 +2235,9 @@ igb_allocate_legacy(struct adapter *adapter) { device_t dev = adapter->dev; struct igb_queue *que = adapter->queues; +#if __FreeBSD_version >= 800000 struct tx_ring *txr = adapter->tx_rings; +#endif int error, rid = 0; /* Turn off all interrupts */ -- 1.7.6.153.g78432