[PATCH 2.6] Update to module_params() in 3c59x.c

From: Maciej Soltysiak (solt2_at_dns.toxicfilms.tv)
Date: 12/30/04

  • Next message: Andrew Haninger: "Fwd: Toshiba PS/2 touchpad on 2.6.X not working along bottom and right sides" 
    Date:	Thu, 30 Dec 2004 15:40:20 +0100
To: linux-net@vger.kernel.org

    Hi!

    This patch:
    1) updates the 3c59x.c driver to use module_param() stuff.
    2) kills a strange character somewhere at the bottom of the patch

    I hope it is right, it is my first glance at module_param() :-)

     3c59x.c | 67 +++++++++++++++++++++++++++++++---------------------------------
     1 files changed, 33 insertions(+), 34 deletions(-)

    Oh, in order to use the module_param() macros i had to move the variable
    before module_param.

    Signed-off-by: Maciej Soltysiak <solt2@dns.toxicfilms.tv>

    Please review and hopefully apply.
    Regars,
    Maciej

    diff -ru linux.orig/drivers/net/3c59x.c linux/drivers/net/3c59x.c
    --- linux.orig/drivers/net/3c59x.c 2004-12-30 15:27:40.000000000 +0100
    +++ linux/drivers/net/3c59x.c 2004-12-30 14:33:29.000000000 +0100
    @@ -240,6 +240,7 @@
     
     #include <linux/config.h>
     #include <linux/module.h>
    +#include <linux/moduleparam.h>
     #include <linux/kernel.h>
     #include <linux/string.h>
     #include <linux/timer.h>
    @@ -269,6 +270,23 @@
     
     #include <linux/delay.h>
     
    +/* This driver uses 'options' to pass the media type, full-duplex flag, etc. */
    +/* Option count limit only -- unlimited interfaces are supported. */
    +#define MAX_UNITS 8
    +static int options[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1,};
    +static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    +static int hw_checksums[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    +static int flow_ctrl[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    +static int enable_wol[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    +static int global_options = -1;
    +static int global_full_duplex = -1;
    +static int global_enable_wol = -1;
    +
    +/* #define dev_alloc_skb dev_alloc_skb_debug */
    +
    +/* Variables to work-around the Compaq PCI BIOS32 problem. */
    +static int compaq_ioaddr, compaq_irq, compaq_device_id = 0x5900;
    +static struct net_device *compaq_net_device;
     
     static char version[] __devinitdata =
     DRV_NAME ": Donald Becker and others. www.scyld.com/network/vortex.html\n";
    @@ -279,21 +297,21 @@
     MODULE_LICENSE("GPL");
     MODULE_VERSION(DRV_VERSION);
     
    -MODULE_PARM(debug, "i");
    -MODULE_PARM(global_options, "i");
    -MODULE_PARM(options, "1-" __MODULE_STRING(8) "i");
    -MODULE_PARM(global_full_duplex, "i");
    -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(8) "i");
    -MODULE_PARM(hw_checksums, "1-" __MODULE_STRING(8) "i");
    -MODULE_PARM(flow_ctrl, "1-" __MODULE_STRING(8) "i");
    -MODULE_PARM(global_enable_wol, "i");
    -MODULE_PARM(enable_wol, "1-" __MODULE_STRING(8) "i");
    -MODULE_PARM(rx_copybreak, "i");
    -MODULE_PARM(max_interrupt_work, "i");
    -MODULE_PARM(compaq_ioaddr, "i");
    -MODULE_PARM(compaq_irq, "i");
    -MODULE_PARM(compaq_device_id, "i");
    -MODULE_PARM(watchdog, "i");
    +module_param(debug, int, 0);
    +module_param(global_options, int, 0);
    +module_param_array(options, int, NULL, 0);
    +module_param(global_full_duplex, int, 0);
    +module_param_array(full_duplex, int, NULL, 0);
    +module_param_array(hw_checksums, int, NULL, 0);
    +module_param_array(flow_ctrl, int, NULL, 0);
    +module_param(global_enable_wol, int, 0);
    +module_param_array(enable_wol, int, NULL, 0);
    +module_param(rx_copybreak, int, 0);
    +module_param(max_interrupt_work, int, 0);
    +module_param(compaq_ioaddr, int, 0);
    +module_param(compaq_irq, int, 0);
    +module_param(compaq_device_id, int, 0);
    +module_param(watchdog, int, 0);
     MODULE_PARM_DESC(debug, "3c59x debug level (0-6)");
     MODULE_PARM_DESC(options, "3c59x: Bits 0-3: media type, bit 4: bus mastering, bit 9: full duplex");
     MODULE_PARM_DESC(global_options, "3c59x: same as options, but applies to all NICs if options is unset");
    @@ -910,25 +928,6 @@
     static struct ethtool_ops vortex_ethtool_ops;
     static void set_8021q_mode(struct net_device *dev, int enable);
     
    -
    -/* This driver uses 'options' to pass the media type, full-duplex flag, etc. */
    -/* Option count limit only -- unlimited interfaces are supported. */
    -#define MAX_UNITS 8
    -static int options[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1,};
    -static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    -static int hw_checksums[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    -static int flow_ctrl[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    -static int enable_wol[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
    -static int global_options = -1;
    -static int global_full_duplex = -1;
    -static int global_enable_wol = -1;
    -
    -/* #define dev_alloc_skb dev_alloc_skb_debug */
    -
    -/* Variables to work-around the Compaq PCI BIOS32 problem. */
    -static int compaq_ioaddr, compaq_irq, compaq_device_id = 0x5900;
    -static struct net_device *compaq_net_device;
    -
     static int vortex_cards_found;
     
     #ifdef CONFIG_NET_POLL_CONTROLLER

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Andrew Haninger: "Fwd: Toshiba PS/2 touchpad on 2.6.X not working along bottom and right sides"

    Relevant Pages