summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-25 22:11:38 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-25 22:11:38 -0400
commitad6a9984eec72f3a609a8685281740f5e5f466aa (patch)
treec5c7ec0240ac7f99685153119e2cb70d526a92bc /drivers/net
parent38778204a1ad0d2c266f85170c2fb7d80ed43160 (diff)
parent562faf469f35bf63c0b021550811280c81bdc52e (diff)
downloadblackbird-op-linux-ad6a9984eec72f3a609a8685281740f5e5f466aa.tar.gz
blackbird-op-linux-ad6a9984eec72f3a609a8685281740f5e5f466aa.zip
Automatic merge of /spare/repo/netdev-2.6 branch tlan
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tlan.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index a7ffa64502dd..9680a308c62b 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -193,6 +193,12 @@ static int aui[MAX_TLAN_BOARDS];
static int duplex[MAX_TLAN_BOARDS];
static int speed[MAX_TLAN_BOARDS];
static int boards_found;
+module_param_array(aui, int, NULL, 0);
+module_param_array(duplex, int, NULL, 0);
+module_param_array(speed, int, NULL, 0);
+MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)");
+MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
+MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)");
MODULE_AUTHOR("Maintainer: Samuel Chessman <chessman@tux.org>");
MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet PCI adapters");
@@ -204,8 +210,13 @@ MODULE_LICENSE("GPL");
/* Turn on debugging. See Documentation/networking/tlan.txt for details */
static int debug;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "ThunderLAN debug mask");
static int bbuf;
+module_param(bbuf, int, 0);
+MODULE_PARM_DESC(bbuf, "ThunderLAN use big buffer (0-1)");
+
static u8 *TLanPadBuffer;
static dma_addr_t TLanPadBufferDMA;
static char TLanSignature[] = "TLAN";
@@ -2381,6 +2392,7 @@ TLan_FinishReset( struct net_device *dev )
TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );
return;
}
+ TLan_SetMulticastList(dev);
} /* TLan_FinishReset */
OpenPOWER on IntegriCloud