From owner-svn-src-head@FreeBSD.ORG Mon Sep 9 17:46:14 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E06BE521; Mon, 9 Sep 2013 17:46:14 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA4DD2845; Mon, 9 Sep 2013 17:46:14 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id B3284B99B; Mon, 9 Sep 2013 13:46:13 -0400 (EDT) From: John Baldwin To: Adrian Chadd Subject: Re: svn commit: r254199 - in head/sys: contrib/dev/iwn modules/iwnfw/iwn6000g2a Date: Mon, 9 Sep 2013 13:37:29 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <201308110103.r7B13WJn070719@svn.freebsd.org> In-Reply-To: <201308110103.r7B13WJn070719@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201309091337.29326.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 09 Sep 2013 13:46:13 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 17:46:15 -0000 On Saturday, August 10, 2013 9:03:32 pm Adrian Chadd wrote: > Author: adrian > Date: Sun Aug 11 01:03:32 2013 > New Revision: 254199 > URL: http://svnweb.freebsd.org/changeset/base/254199 > > Log: > Update the 6000g2a image. > > Obtained from: Linux, Intel > > Added: > head/sys/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu > Modified: > head/sys/modules/iwnfw/iwn6000g2a/Makefile This exposed a bug in sys/conf/kmod.mk for me. I use NO_KERNELCLEAN by default when upgrading my kernels (and have for many years), but the version information in the 'FIRMWS' variable used to generate the C stub is not treated as a dependency of the generated stub. Thus, when I upgraded past this, the firmware module reused the previous C stub which used a symbol that hardcoded the previous firmware version number, so the linker saw it as an unresolved symbol and failed to load it. I don't think anything is wrong with this commit at all. I just wonder if there's a good way to make the C stub depend on the value of FIRMWS and have it be regenerated if FIRMWS changes. -- John Baldwin