From: Andy Gospodarek <gospo@redhat.com> Date: Wed, 13 Oct 2010 18:22:15 -0400 Subject: [net] updated drivers need version string updates too Message-id: <1286994135-11246-1-git-send-email-gospo@redhat.com> Patchwork-id: 28723 O-Subject: [PATCH RHEL5.6] net: make sure updated drivers have version string updates Bugzilla: 635027 RH-Acked-by: Neil Horman <nhorman@redhat.com> RH-Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> I went through all the network drivers (wired and wireless) and made sure the version-string of any driver with functional changes during the update cycle was modified. Most of the drivers that took large steps forward saw updates to their version-string, so not all drivers needed to be modified. The plan going forward will be to add '-N' to the end of the existing driver version-string where N=1 for the first iteration and will increment by one each time an update is made. This should work well with z-stream since those changes need to hit y-stream first and we can increment 'N' by more than one during y-stream updates (not once per upstream patch, but once per patch-set). Unfortunately tracking this is not automated, but we need to start somewhere. I've heard complaints that customers like to see a change in the version string if bugs were fixed. We need to start helping them out with this. This will resolve RHBZ 635027. diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 64425ea..6528dcd 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -23,7 +23,7 @@ #include "bond_3ad.h" #include "bond_alb.h" -#define DRV_VERSION "3.4.0" +#define DRV_VERSION "3.4.0-1" #define DRV_RELDATE "October 7, 2008" #define DRV_NAME "bonding" #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h index 9d0bd9d..9f5dfcf 100644 --- a/drivers/net/cxgb3/version.h +++ b/drivers/net/cxgb3/version.h @@ -35,7 +35,7 @@ #define DRV_DESC "Chelsio T3 Network Driver" #define DRV_NAME "cxgb3" /* Driver version */ -#define DRV_VERSION "1.1.3-ko" +#define DRV_VERSION "1.1.3-ko-1" /* Firmware version */ #define FW_VERSION_MAJOR 7 diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 426d524..18cd9e8 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -159,7 +159,7 @@ #define DRV_NAME "e100" #define DRV_EXT "-NAPI" -#define DRV_VERSION "3.5.10-k3"DRV_EXT +#define DRV_VERSION "3.5.10-k3-1"DRV_EXT #define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" #define DRV_COPYRIGHT "Copyright(c) 1999-2005 Intel Corporation" #define PFX DRV_NAME ": " diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index aeb505d..4d3bee7 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -37,7 +37,7 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver"; #else #define DRIVERNAPI "-NAPI" #endif -#define DRV_VERSION "7.3.21-k4.1"DRIVERNAPI +#define DRV_VERSION "7.3.21-k4-2"DRIVERNAPI const char e1000_driver_version[] = DRV_VERSION; static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation."; diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 2c50271..ac4d73b 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c @@ -105,7 +105,7 @@ static struct proc_dir_entry *ibmveth_proc_dir; static const char ibmveth_driver_name[] = "ibmveth"; static const char ibmveth_driver_string[] = "IBM i/pSeries Virtual Ethernet Driver"; -#define ibmveth_driver_version "1.03" +#define ibmveth_driver_version "1.03-1" MODULE_AUTHOR("Santiago Leon <santil@us.ibm.com>"); MODULE_DESCRIPTION("IBM i/pSeries Virtual Ethernet Driver"); diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index fbfebf0..57c2db9 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -48,7 +48,7 @@ #include <linux/pcieport_if.h> #include "igb.h" -#define DRV_VERSION "2.1.0-k2" +#define DRV_VERSION "2.1.0-k2-1" char igb_driver_name[] = "igb"; char igb_driver_version[] = DRV_VERSION; static const char igb_driver_string[] = diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index 4478a9b..a59dde4 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c @@ -43,7 +43,7 @@ #include "igbvf.h" -#define DRV_VERSION "1.0.0-k0" +#define DRV_VERSION "1.0.0-k0-1" char igbvf_driver_name[] = "igbvf"; const char igbvf_driver_version[] = DRV_VERSION; static const char igbvf_driver_string[] = diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index ffde244..4e6d9db 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -36,7 +36,7 @@ static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver"; #else #define DRIVERNAPI "-NAPI" #endif -#define DRV_VERSION "1.0.126-k4"DRIVERNAPI +#define DRV_VERSION "1.0.126-k4-1"DRIVERNAPI const char ixgb_driver_version[] = DRV_VERSION; static const char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation."; diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c index 04f2e27..829fe00 100644 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c @@ -52,7 +52,7 @@ char ixgbevf_driver_name[] = "ixgbevf"; static const char ixgbevf_driver_string[] = "Intel(R) 82599 Virtual Function"; -#define DRV_VERSION "1.0.0-k0" +#define DRV_VERSION "1.0.0-k0-1" const char ixgbevf_driver_version[] = DRV_VERSION; static char ixgbevf_copyright[] = "Copyright (c) 2009 Intel Corporation."; diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index feda8a0..e062414 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -39,7 +39,7 @@ #define DRV_NAME "qla3xxx" #define DRV_STRING "QLogic ISP3XXX Network Driver" -#define DRV_VERSION "v2.03.00.00.05.03-k4" +#define DRV_VERSION "v2.03.00.00.05.03-k4-1" #define PFX DRV_NAME " " static const char ql3xxx_driver_name[] = DRV_NAME; diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 1a16d23..2447a55 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -28,7 +28,7 @@ #include <asm/io.h> #include <asm/irq.h> -#define RTL8169_VERSION "2.3LK-NAPI" +#define RTL8169_VERSION "2.3LK-1-NAPI" #define MODULENAME "r8169" #define PFX MODULENAME ": " diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 1d61d0b..3af2427 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -79,7 +79,7 @@ MODULE_AUTHOR("Nick Kossifidis"); MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); MODULE_LICENSE("Dual BSD/GPL"); -MODULE_VERSION("0.6.0 (EXPERIMENTAL)"); +MODULE_VERSION("0.6.0-1 (EXPERIMENTAL)"); /* Known PCI ids */ diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 556b1dc..16843a2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h @@ -70,7 +70,7 @@ struct iwl_host_cmd; struct iwl_cmd; -#define IWLWIFI_VERSION "1.3.27k" +#define IWLWIFI_VERSION "1.3.27k-1" #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 d01a088..b8a2291 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -79,7 +79,7 @@ #define VS #endif -#define IWL39_VERSION "1.2.26k" VD VS +#define IWL39_VERSION "1.2.26k-1" VD VS #define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation" #define DRV_AUTHOR "<ilw@linux.intel.com>" #define DRV_VERSION IWL39_VERSION