From owner-cvs-src-old@FreeBSD.ORG Tue May 31 19:08:34 2011 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 617E41065789 for ; Tue, 31 May 2011 19:08:34 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F38E8FC16 for ; Tue, 31 May 2011 19:08:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p4VJ8YU3044117 for ; Tue, 31 May 2011 19:08:34 GMT (envelope-from bschmidt@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p4VJ8YBD044116 for cvs-src-old@freebsd.org; Tue, 31 May 2011 19:08:34 GMT (envelope-from bschmidt@repoman.freebsd.org) Message-Id: <201105311908.p4VJ8YBD044116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to bschmidt@repoman.freebsd.org using -f From: Bernhard Schmidt Date: Tue, 31 May 2011 19:08:25 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/ipw if_ipw.c src/sys/dev/iwi if_iwi.c src/sys/dev/iwn if_iwn.c src/sys/dev/wpi if_wpi.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2011 19:08:34 -0000 bschmidt 2011-05-31 19:08:25 UTC FreeBSD src repository Modified files: sys/dev/ipw if_ipw.c sys/dev/iwi if_iwi.c sys/dev/iwn if_iwn.c sys/dev/wpi if_wpi.c Log: SVN rev 222543 on 2011-05-31 19:08:25Z by bschmidt Add module version to iwi/ipw/wpi and iwn. The version is used to check if a module is already preset, not setting it results in: can't re-use a leaf (ipw)! module_register: module pci/ipw already exists! Module pci/ipw failed to register: 17 while trying to load the module due to an entry in loader.conf. With this commit we get the expected: module ipw already present! Reported by: Dru Lavigne, bz Tested by: bz MFC after: 1 week Revision Changes Path 1.55 +2 -0 src/sys/dev/ipw/if_ipw.c 1.79 +2 -0 src/sys/dev/iwi/if_iwi.c 1.111 +2 -0 src/sys/dev/iwn/if_iwn.c 1.45 +2 -0 src/sys/dev/wpi/if_wpi.c