Commit 5ad18900 authored May 26, 2009 by Alex Chiang Committed by David S. Miller May 26, 2009

atlx: move modinfo data from atlx.h to atl1.c



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>

Reported-by: Scott Scriven <scott.scriven@hp.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Acked-by: Jay Cliburn <jcliburn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 18a36c1a

drivers/net/atlx/atl1.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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"

drivers/net/atlx/atlx.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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

Admin message