[PATCH 2.6.10-bk2] xircom_tulip_cb.c had uncompilable module_param declarations

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



	linux-2.6.10-bk2/drivers/net/tulip/xircom_tulip_cb.c did not
compile, due to module_param declarations.  The 2.6.10 version did
compile.  Because "debug" is a #define, I had to move the module_param
declaration for the debug symbol to after the #define.  I also moved
the rest of the module_param declarations to keep them together.
Finally, the module_param_array parameters are corrected, I think
(at least they compile).

Tangential note:

	Also I should mention that xircom_tulip_cb.c still uses interrupt
handling primitives that are only defined only for uniprocessors,
so one cannot currently ship a generic kernel that can use SMP and
also support this Cardbus card, and one might also want to
CONFIG_PREEMPT on a notebook computer.  Also, I imagine that
hyperthreading notebook computers are immanent, and while those
notebook computers would undoubtedly have ethernet built in,
users of such computers may want to run a second ethernet in
certain cases.

                    __     ______________ 
Adam J. Richter        \ /
adam@xxxxxxxxxxxxx      | g g d r a s i l


--- linux-2.6.10-bk2/drivers/net/tulip/xircom_tulip_cb.c	2004-12-30 17:04:16.000000000 +0800
+++ linux/drivers/net/tulip/xircom_tulip_cb.c	2004-12-30 23:13:00.000000000 +0800
@@ -119,14 +119,7 @@
 MODULE_LICENSE("GPL v2");
 MODULE_VERSION(DRV_VERSION);
 
-module_param(debug, int, 0);
-module_param(max_interrupt_work, int, 0);
-module_param(rx_copybreak, int, 0);
-module_param(csr0, int, 0);
-
 static int num_units;
-module_param_array(options, num_units, int, 0);
-module_param_array(full_duplex, num_units, int, 0);
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -137,6 +130,13 @@
 static int xircom_debug = 1;
 #endif
 
+module_param(debug, int, 0);
+module_param(max_interrupt_work, int, 0);
+module_param(rx_copybreak, int, 0);
+module_param(csr0, int, 0);
+module_param_array(options, int, &num_units, 0);
+module_param_array(full_duplex, int, &num_units, 0);
+
 /*
 				Theory of Operation
 
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux 802.1Q VLAN]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Git]     [Bugtraq]     [Yosemite News and Information]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux PCI]     [Linux Admin]     [Samba]

  Powered by Linux