netdev - Re: [PATCH] atlx: move modinfo data from atlx.h to atl1.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 26 May 2009 19:48:52 -0500
From:	Jay Cliburn <jcliburn@...il.com>
To:	Alex Chiang <achiang@...com>
Cc:	davem@...emloft.net, scott.scriven@...com, netdev@...r.kernel.org
Subject: Re: [PATCH] atlx: move modinfo data from atlx.h to atl1.c

On Tue, 26 May 2009 16:33:50 -0600
Alex Chiang <achiang@...com> wrote:

> Both atl1.c and atl2.c include atlx.h, which defines some modinfo
> stuff. But atl2.c seems like it doesn't want the modinfo data
> from atlx.h, as it defines its own.
> 
> Running modinfo on atl2.ko, we get conflicting information:
> 
> $ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author"
> version:        2.2.3
> description:    Atheros Fast Ethernet Network Driver
> author:         Atheros Corporation <xiong.huang@...eros.com>, Chris Snook <csnook@...hat.com>
> version:        2.1.3
> author:         Xiong Huang <xiong.huang@...eros.com>, 	Chris Snook <csnook@...hat.com>, Jay Cliburn <jcliburn@...il.com>
> 
> Move the modinfo data out of atlx.h and into atl1.c to eliminate
> the confusion:
> 
> $ /sbin/modinfo drivers/net/atlx/atl1.ko | egrep "version|description|author"
> version:        2.1.3
> author:         Xiong Huang <xiong.huang@...eros.com>, 	Chris Snook <csnook@...hat.com>, Jay Cliburn <jcliburn@...il.com>
> description:    Atheros L1 Gigabit Ethernet Driver
> 
> $ /sbin/modinfo drivers/net/atlx/atl2.ko | egrep "version|description|author"
> version:        2.2.3
> description:    Atheros Fast Ethernet Network Driver
> author:         Atheros Corporation <xiong.huang@...eros.com>, Chris Snook <csnook@...hat.com>
> 
> Cc: Jay Cliburn <jcliburn@...il.com>
> Reported-by: Scott Scriven <scott.scriven@...com>
> Signed-off-by: Alex Chiang <achiang@...com>

Acked-by: Jay Cliburn <jcliburn@...il.com>

> ---
>  atl1.c |    6 ++++++
>  atlx.h |    6 ------
>  2 files changed, 6 insertions(+), 6 deletions(-)
> ---
> diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
> index 13f0bdc..152852f 100644
> --- a/drivers/net/atlx/atl1.c
> +++ b/drivers/net/atlx/atl1.c
> @@ -82,6 +82,12 @@
>  
>  #include "atl1.h"
>  
> +#define ATLX_DRIVER_VERSION "2.1.3"
> +MODULE_AUTHOR("Xiong Huang <xiong.huang@...eros.com>, \
> +	Chris Snook <csnook@...hat.com>, Jay Cliburn <jcliburn@...il.com>");
> +MODULE_LICENSE("GPL");
> +MODULE_VERSION(ATLX_DRIVER_VERSION);
> +
>  /* Temporary hack for merging atl1 and atl2 */
>  #include "atlx.c"
>  
> diff --git a/drivers/net/atlx/atlx.h b/drivers/net/atlx/atlx.h
> index 297a03d..14054b7 100644
> --- a/drivers/net/atlx/atlx.h
> +++ b/drivers/net/atlx/atlx.h
> @@ -29,12 +29,6 @@
>  #include <linux/module.h>
>  #include <linux/types.h>
>  
> -#define ATLX_DRIVER_VERSION "2.1.3"
> -MODULE_AUTHOR("Xiong Huang <xiong.huang@...eros.com>, \
> -	Chris Snook <csnook@...hat.com>, Jay Cliburn <jcliburn@...il.com>");
> -MODULE_LICENSE("GPL");
> -MODULE_VERSION(ATLX_DRIVER_VERSION);
> -
>  #define ATLX_ERR_PHY			2
>  #define ATLX_ERR_PHY_SPEED		7
>  #define ATLX_ERR_PHY_RES		8
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html