Date: Tue, 11 Mar 2014 15:17:05 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r263025 - stable/10/sys/dev/e1000 Message-ID: <201403111517.s2BFH59k041979@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Mar 11 15:17:04 2014 New Revision: 263025 URL: http://svnweb.freebsd.org/changeset/base/263025 Log: Merge r261169: Fix compilation with IGB_LEGACY_TX defined. PR: 185909 Modified: stable/10/sys/dev/e1000/if_igb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/e1000/if_igb.c ============================================================================== --- stable/10/sys/dev/e1000/if_igb.c Tue Mar 11 14:59:34 2014 (r263024) +++ stable/10/sys/dev/e1000/if_igb.c Tue Mar 11 15:17:04 2014 (r263025) @@ -2380,7 +2380,9 @@ igb_allocate_legacy(struct adapter *adap { device_t dev = adapter->dev; struct igb_queue *que = adapter->queues; +#ifndef IGB_LEGACY_TX struct tx_ring *txr = adapter->tx_rings; +#endif int error, rid = 0; /* Turn off all interrupts */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403111517.s2BFH59k041979>