* [PATCH] iwlwifi: remove generated/utsrelease.h dependency @ 2009-12-24 7:31 Zhu Yi 2009-12-24 7:43 ` Luis R. Rodriguez 2009-12-24 8:20 ` [PATCH] iwlwifi: remove generated/utsrelease.h dependency Sedat Dilek 0 siblings, 2 replies; 6+ messages in thread From: Zhu Yi @ 2009-12-24 7:31 UTC (permalink / raw) To: linville; +Cc: linux-wireless, Zhu Yi Commit 900bb717424e5df12b1ef7ebb017be2a8915b806 uses UTS_RELEASE as the the in-tree iwlwifi driver version. However the inclusion of generated/utsrelease.h makes it a unpleasant behaviour to recompile the driver everytime when utsrelease.h is updated. In fact, the driver module is already built with the UTS_RELEASE information via vermagic of modinfo. Mark the in-tree driver with the version string "in-tree" to distinguish with those old out-of-tree drivers. Reported-by: David Miller <davem@davemloft.net> Signed-off-by: Zhu Yi <yi.zhu@intel.com> --- drivers/net/wireless/iwlwifi/iwl-core.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 308f679..375226b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h @@ -63,8 +63,6 @@ #ifndef __iwl_core_h__ #define __iwl_core_h__ -#include <generated/utsrelease.h> - /************************ * forward declarations * ************************/ @@ -72,7 +70,7 @@ struct iwl_host_cmd; struct iwl_cmd; -#define IWLWIFI_VERSION UTS_RELEASE "-k" +#define IWLWIFI_VERSION "in-tree:" #define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation" #define DRV_AUTHOR "<ilw@linux.intel.com>" -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlwifi: remove generated/utsrelease.h dependency 2009-12-24 7:31 [PATCH] iwlwifi: remove generated/utsrelease.h dependency Zhu Yi @ 2009-12-24 7:43 ` Luis R. Rodriguez 2009-12-25 1:46 ` Zhu, Yi 2009-12-24 8:20 ` [PATCH] iwlwifi: remove generated/utsrelease.h dependency Sedat Dilek 1 sibling, 1 reply; 6+ messages in thread From: Luis R. Rodriguez @ 2009-12-24 7:43 UTC (permalink / raw) To: Zhu Yi; +Cc: linville, linux-wireless On Wed, Dec 23, 2009 at 11:31 PM, Zhu Yi <yi.zhu@intel.com> wrote: > Commit 900bb717424e5df12b1ef7ebb017be2a8915b806 uses UTS_RELEASE > as the the in-tree iwlwifi driver version. However the inclusion > of generated/utsrelease.h makes it a unpleasant behaviour to > recompile the driver everytime when utsrelease.h is updated. In > fact, the driver module is already built with the UTS_RELEASE > information via vermagic of modinfo. Mark the in-tree driver > with the version string "in-tree" to distinguish with those old > out-of-tree drivers. > > Reported-by: David Miller <davem@davemloft.net> > Signed-off-by: Zhu Yi <yi.zhu@intel.com> > --- > drivers/net/wireless/iwlwifi/iwl-core.h | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h > index 308f679..375226b 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-core.h > +++ b/drivers/net/wireless/iwlwifi/iwl-core.h > @@ -63,8 +63,6 @@ > #ifndef __iwl_core_h__ > #define __iwl_core_h__ > > -#include <generated/utsrelease.h> > - > /************************ > * forward declarations * > ************************/ > @@ -72,7 +70,7 @@ struct iwl_host_cmd; > struct iwl_cmd; > > > -#define IWLWIFI_VERSION UTS_RELEASE "-k" > +#define IWLWIFI_VERSION "in-tree:" > #define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation" > #define DRV_AUTHOR "<ilw@linux.intel.com>" Why is a version even needed? Luis ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] iwlwifi: remove generated/utsrelease.h dependency 2009-12-24 7:43 ` Luis R. Rodriguez @ 2009-12-25 1:46 ` Zhu, Yi 2010-01-05 21:54 ` [PATCH] iwlwifi: remove IWLWIFI_VERSION John W. Linville 0 siblings, 1 reply; 6+ messages in thread From: Zhu, Yi @ 2009-12-25 1:46 UTC (permalink / raw) To: Luis R. Rodriguez; +Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org RnJvbTogTHVpcyBSLiBSb2RyaWd1ZXogW21haWx0bzptY2dyb2ZAZ21haWwuY29tXSANCg0KPiBX aHkgaXMgYSB2ZXJzaW9uIGV2ZW4gbmVlZGVkPw0KDQpUaGUgcmVhc29uIGlzIHdlIHdhbnQgdG8g Z2V0IHRoZSBkcml2ZXIgY29uZmlnIG9wdGlvbnMgZWFzaWx5IGZyb20gYSBidWcgcmVwb3J0LiBG b3INCmV4YW1wbGUsIENPTkZJR19JV0xXSUZJX0RFQlVHLCBTUEVDVFJVTV9NRUFTVVJFTUVOVCwg ZXRjLiBTb21ldGltZXMgdGhleQ0KYXJlIG5vdCB2ZXJ5IGVhc3kgdG8gdGVsbCBmb3IgYW4gT1NE IHByb3ZpZGVkIGRyaXZlci4NCg0KVGhhbmtzLA0KLXlpDQo= ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] iwlwifi: remove IWLWIFI_VERSION 2009-12-25 1:46 ` Zhu, Yi @ 2010-01-05 21:54 ` John W. Linville 2010-01-06 0:08 ` reinette chatre 0 siblings, 1 reply; 6+ messages in thread From: John W. Linville @ 2010-01-05 21:54 UTC (permalink / raw) To: linux-wireless; +Cc: Zhu Yi, John W. Linville Also remove the MODULE_VERSION macros using IWLWIFI_VERSION. Those places using IWLWIFI_VERSION at runtime are modified to use init_utsname()->release instead. Signed-off-by: John W. Linville <linville@tuxdriver.com> --- How about this as a compromise? drivers/net/wireless/iwlwifi/iwl-agn.c | 7 ++++--- drivers/net/wireless/iwlwifi/iwl-core.c | 1 - drivers/net/wireless/iwlwifi/iwl-core.h | 1 - drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 ++++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 771b03c..f5522f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -40,6 +40,7 @@ #include <linux/firmware.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/utsname.h> #include <net/mac80211.h> @@ -79,11 +80,10 @@ #define VS #endif -#define DRV_VERSION IWLWIFI_VERSION VD VS +#define DRV_VERSION VD VS MODULE_DESCRIPTION(DRV_DESCRIPTION); -MODULE_VERSION(DRV_VERSION); MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); MODULE_LICENSE("GPL"); MODULE_ALIAS("iwl4965"); @@ -3884,7 +3884,8 @@ static int __init iwl_init(void) { int ret; - printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n"); + printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", %s-" DRV_VERSION "\n", + init_utsname()->release); printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n"); ret = iwlagn_rate_control_register(); diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 14f4829..756c49a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -43,7 +43,6 @@ MODULE_DESCRIPTION("iwl core"); -MODULE_VERSION(IWLWIFI_VERSION); MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); MODULE_LICENSE("GPL"); diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 1728f96..106651b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h @@ -72,7 +72,6 @@ struct iwl_host_cmd; struct iwl_cmd; -#define IWLWIFI_VERSION UTS_RELEASE "-k" #define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation" #define DRV_AUTHOR "<ilw@linux.intel.com>" diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 10b0aa8..8b5ffff 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -40,6 +40,7 @@ #include <linux/firmware.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/utsname.h> #include <net/ieee80211_radiotap.h> #include <net/mac80211.h> @@ -76,12 +77,11 @@ #define VS #endif -#define DRV_VERSION IWLWIFI_VERSION VD VS +#define DRV_VERSION VD VS #define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation" #define DRV_AUTHOR "<ilw@linux.intel.com>" MODULE_DESCRIPTION(DRV_DESCRIPTION); -MODULE_VERSION(DRV_VERSION); MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); MODULE_LICENSE("GPL"); @@ -4279,7 +4279,8 @@ static int __init iwl3945_init(void) { int ret; - printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n"); + printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", %s-" DRV_VERSION "\n", + init_utsname()->release); printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n"); ret = iwl3945_rate_control_register(); -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlwifi: remove IWLWIFI_VERSION 2010-01-05 21:54 ` [PATCH] iwlwifi: remove IWLWIFI_VERSION John W. Linville @ 2010-01-06 0:08 ` reinette chatre 0 siblings, 0 replies; 6+ messages in thread From: reinette chatre @ 2010-01-06 0:08 UTC (permalink / raw) To: John W. Linville; +Cc: linux-wireless@vger.kernel.org, Zhu, Yi Hi John, On Tue, 2010-01-05 at 13:54 -0800, John W. Linville wrote: > Also remove the MODULE_VERSION macros using IWLWIFI_VERSION. Those > places using IWLWIFI_VERSION at runtime are modified to use > init_utsname()->release instead. > > Signed-off-by: John W. Linville <linville@tuxdriver.com> > --- > How about this as a compromise? Thank you for looking at this. I do think it is valuable for a user to see the parameters the module was compiled with when running "modinfo". I thus would like the MODULE_VERSION to stay. Including the kernel version number at runtime seems fine. The version number display may be a bit strange when a user did not compile with any of the options since the version number will then end with "-". Reinette ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iwlwifi: remove generated/utsrelease.h dependency 2009-12-24 7:31 [PATCH] iwlwifi: remove generated/utsrelease.h dependency Zhu Yi 2009-12-24 7:43 ` Luis R. Rodriguez @ 2009-12-24 8:20 ` Sedat Dilek 1 sibling, 0 replies; 6+ messages in thread From: Sedat Dilek @ 2009-12-24 8:20 UTC (permalink / raw) To: Zhu Yi; +Cc: linville, linux-wireless Note: This patch is for upstream (2.6.33) and occured after having merged linux-kbuild tree [1] in linus-tree. - Sedat - [1] http://repo.or.cz/w/linux-kbuild.git On Thu, Dec 24, 2009 at 8:31 AM, Zhu Yi <yi.zhu@intel.com> wrote: > Commit 900bb717424e5df12b1ef7ebb017be2a8915b806 uses UTS_RELEASE > as the the in-tree iwlwifi driver version. However the inclusion > of generated/utsrelease.h makes it a unpleasant behaviour to > recompile the driver everytime when utsrelease.h is updated. In > fact, the driver module is already built with the UTS_RELEASE > information via vermagic of modinfo. Mark the in-tree driver > with the version string "in-tree" to distinguish with those old > out-of-tree drivers. > > Reported-by: David Miller <davem@davemloft.net> > Signed-off-by: Zhu Yi <yi.zhu@intel.com> > --- > drivers/net/wireless/iwlwifi/iwl-core.h | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h > index 308f679..375226b 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-core.h > +++ b/drivers/net/wireless/iwlwifi/iwl-core.h > @@ -63,8 +63,6 @@ > #ifndef __iwl_core_h__ > #define __iwl_core_h__ > > -#include <generated/utsrelease.h> > - > /************************ > * forward declarations * > ************************/ > @@ -72,7 +70,7 @@ struct iwl_host_cmd; > struct iwl_cmd; > > > -#define IWLWIFI_VERSION UTS_RELEASE "-k" > +#define IWLWIFI_VERSION "in-tree:" > #define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation" > #define DRV_AUTHOR "<ilw@linux.intel.com>" > > -- > 1.6.3.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-01-06 0:08 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-12-24 7:31 [PATCH] iwlwifi: remove generated/utsrelease.h dependency Zhu Yi 2009-12-24 7:43 ` Luis R. Rodriguez 2009-12-25 1:46 ` Zhu, Yi 2010-01-05 21:54 ` [PATCH] iwlwifi: remove IWLWIFI_VERSION John W. Linville 2010-01-06 0:08 ` reinette chatre 2009-12-24 8:20 ` [PATCH] iwlwifi: remove generated/utsrelease.h dependency Sedat Dilek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox