* [PATCH] atlx: move modinfo data from atlx.h to atl1.c
@ 2009-05-26 22:33 Alex Chiang
2009-05-27 0:48 ` Jay Cliburn
0 siblings, 1 reply; 3+ messages in thread
From: Alex Chiang @ 2009-05-26 22:33 UTC (permalink / raw)
To: davem; +Cc: jcliburn, scott.scriven, netdev
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@atheros.com>, Chris Snook <csnook@redhat.com>
version: 2.1.3
author: Xiong Huang <xiong.huang@atheros.com>, Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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@atheros.com>, Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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@atheros.com>, Chris Snook <csnook@redhat.com>
Cc: Jay Cliburn <jcliburn@gmail.com>
Reported-by: Scott Scriven <scott.scriven@hp.com>
Signed-off-by: Alex Chiang <achiang@hp.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@atheros.com>, \
+ Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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@atheros.com>, \
- Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] atlx: move modinfo data from atlx.h to atl1.c
2009-05-26 22:33 [PATCH] atlx: move modinfo data from atlx.h to atl1.c Alex Chiang
@ 2009-05-27 0:48 ` Jay Cliburn
2009-05-27 3:50 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jay Cliburn @ 2009-05-27 0:48 UTC (permalink / raw)
To: Alex Chiang; +Cc: davem, scott.scriven, netdev
On Tue, 26 May 2009 16:33:50 -0600
Alex Chiang <achiang@hp.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@atheros.com>, Chris Snook <csnook@redhat.com>
> version: 2.1.3
> author: Xiong Huang <xiong.huang@atheros.com>, Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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@atheros.com>, Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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@atheros.com>, Chris Snook <csnook@redhat.com>
>
> Cc: Jay Cliburn <jcliburn@gmail.com>
> Reported-by: Scott Scriven <scott.scriven@hp.com>
> Signed-off-by: Alex Chiang <achiang@hp.com>
Acked-by: Jay Cliburn <jcliburn@gmail.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@atheros.com>, \
> + Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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@atheros.com>, \
> - Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] atlx: move modinfo data from atlx.h to atl1.c
2009-05-27 0:48 ` Jay Cliburn
@ 2009-05-27 3:50 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-05-27 3:50 UTC (permalink / raw)
To: jcliburn; +Cc: achiang, scott.scriven, netdev
From: Jay Cliburn <jcliburn@gmail.com>
Date: Tue, 26 May 2009 19:48:52 -0500
> On Tue, 26 May 2009 16:33:50 -0600
> Alex Chiang <achiang@hp.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:
...
>> Reported-by: Scott Scriven <scott.scriven@hp.com>
>> Signed-off-by: Alex Chiang <achiang@hp.com>
>
> Acked-by: Jay Cliburn <jcliburn@gmail.com>
Applied to net-2.6, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-27 3:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-26 22:33 [PATCH] atlx: move modinfo data from atlx.h to atl1.c Alex Chiang
2009-05-27 0:48 ` Jay Cliburn
2009-05-27 3:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).