Minor patch for 2.0.36 tlan.c

Philip Gladstone (philip@raptor.com)
Tue, 08 Dec 1998 10:15:50 -0500


This is a cryptographically signed message in MIME format.

--------------ms1124C2AA0B75FA377E8873F1
Content-Type: multipart/mixed; boundary="------------369E06A944AC7AB59AFBA20F"

This is a multi-part message in MIME format.
--------------369E06A944AC7AB59AFBA20F
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Attached is a small patch that allows the thunderlan (aka
Compaq netelligent) to work when the card is explicitly
added from the boot prompt.

A similar patch should (I expect) be applied to 2.1.whatever.

Philip

-- 
Philip Gladstone                           +1 781 530 2461
Raptor Systems / Axent Technologies 
Waltham, MA                         http://www.raptor.com/
--------------369E06A944AC7AB59AFBA20F
Content-Type: text/plain; charset=us-ascii; name="p9_tlan.rpf"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="p9_tlan.rpf"

--- tlan.c.orig Sun Nov 15 13:33:04 1998 +++ linux/drivers/net/tlan.c Mon Dec 7 13:24:44 1998 @@ -403,6 +403,7 @@ * Parms: * dev device struct to use if adapter is * found. + * or 0 if we need to make a new one. * * The name is lower case to fit in with all the rest of * the netcard_probe names. This function looks for a/ @@ -425,6 +426,16 @@ return -ENODEV; } + /* We don't want init_etherdev to allocate the private area as it + * only does that if it creates a new dev block + */ + dev = init_etherdev( dev, 0 ); + + if ( dev == NULL ) { + printk( "TLAN: Could not allocate memory for device.\n" ); + return -ENOMEM; + } + dev->priv = kmalloc( sizeof(TLanPrivateInfo), GFP_KERNEL ); if ( dev->priv == NULL ) { @@ -451,14 +462,8 @@ priv = (TLanPrivateInfo *) dev->priv; - dev->name = priv->devName; - strcpy( priv->devName, " " ); - - dev = init_etherdev( dev, sizeof(TLanPrivateInfo) ); - dev->base_addr = io_base; dev->irq = irq; - priv->adapter = &TLanAdapterList[index]; priv->adapterRev = rev;

--------------369E06A944AC7AB59AFBA20F--

--------------ms1124C2AA0B75FA377E8873F1 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature

MIIIcQYJKoZIhvcNAQcCoIIIYjCCCF4CAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCC BicwggLXMIICQKADAgECAgIwtDANBgkqhkiG9w0BAQQFADCByDELMAkGA1UEBhMCWkExFTAT BgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxGjAYBgNVBAoTEVRo YXd0ZSBDb25zdWx0aW5nMTMwMQYDVQQLEypDZXJ0aWZpY2F0ZSBTZXJ2aWNlcyBSU0EgSUsg MTk5OC4yLjI1IDg6MzUxOzA5BgNVBAMTMlRoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBSU0Eg SXNzdWluZyBLZXkgMTk5OC4yLjI1MB4XDTk4MDgxMjE0NDIyOVoXDTk5MDgxMjE0NDIyOVow QzEfMB0GA1UEAxMWVGhhd3RlIEZyZWVtYWlsIE1lbWJlcjEgMB4GCSqGSIb3DQEJARYRcGhp bGlwQHJhcHRvci5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAONqzM373SGsMZ5C X1WU1vOr8pZFVRBVJC/WEfc5sR+Q4YAjRk5F4Yww6cHAXtTiptaSWcgK+dli46/5Sy60UX2s iVcl8i6pmcQ/m+kFodrJ1GjZd9SU2+IMnY7liBP2sdwAB02G9EX2B43nAh9/Y2Xl4T8uGV3L oz6CwP5YmUV1AgMBAAGjVDBSMBEGCWCGSAGG+EIBAQQEAwIFoDAOBgNVHQ8BAf8EBAMCBaAw DAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBTtNBduDiteS4eYkbg3p5i/kh+scjANBgkqhkiG 9w0BAQQFAAOBgQBZPzaRk5KnLZCwvJy/y/OaSAfGp1h/c8agEBoLclt3CSytNnT3FVZLq5w/ R0O9wIu8er/eivXt1CvWs/wYpqZpszhmbaIreRZHY9A93G/Zavv7yyMBpK5OVYpkAMUt4rAc 7/twlNMo/493FEBSAiYjdbhIqGOyBikq/R3iyFiyUjCCA0gwggKxoAMCAQICAQgwDQYJKoZI hvcNAQEEBQAwgdExCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNV BAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0Nl cnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25h bCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxAdGhhd3Rl LmNvbTAeFw05ODAyMjUwODM1MzNaFw0wMDAyMjUwODM1MzNaMIHIMQswCQYDVQQGEwJaQTEV MBMGA1UECBMMV2VzdGVybiBDYXBlMRQwEgYDVQQHEwtEdXJiYW52aWxsZTEaMBgGA1UEChMR VGhhd3RlIENvbnN1bHRpbmcxMzAxBgNVBAsTKkNlcnRpZmljYXRlIFNlcnZpY2VzIFJTQSBJ SyAxOTk4LjIuMjUgODozNTE7MDkGA1UEAxMyVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIFJT QSBJc3N1aW5nIEtleSAxOTk4LjIuMjUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMcx w8QbmSNy0lGFlUzjWZLk6GyBtfQbXwnmxK2zRG+qONdX5LDFy7p0rkxhIyR2BvjZXQ2KKLK0 K+0Nu1Ik9LfFSaeDY/wKBLDvgSj35pHGTZfuknYmYshjN3Y8sZIP3K1SBopxxTcxaobbvQhp KFn87cd9JmfdTd7TxQL+d7bhAgMBAAGjNzA1MBIGA1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0j BBgwFqAUcknCczTGVfQLdnKBfnf0h+fGsg4wDQYJKoZIhvcNAQEEBQADgYEAQurti2F+odRc Uqk8vZ6ceegJixKBrY8dWkbt8SUmW8iu/XohFs2gHjuXM4P7TjcqKJemSPUoGAIkfIB7U1C1 +2+a/G2qXCZFqC82IljTGwIDH+6UOfD+NFqISxs9jPPXftOfcFt29tjE4rY8JJ0JJYxZsdSL 8/wEgg6eKYZsxf8xggISMIICDgIBATCBzzCByDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdl c3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxGjAYBgNVBAoTEVRoYXd0ZSBDb25z dWx0aW5nMTMwMQYDVQQLEypDZXJ0aWZpY2F0ZSBTZXJ2aWNlcyBSU0EgSUsgMTk5OC4yLjI1 IDg6MzUxOzA5BgNVBAMTMlRoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBSU0EgSXNzdWluZyBL ZXkgMTk5OC4yLjI1AgIwtDAJBgUrDgMCGgUAoIGZMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0B BwEwHAYJKoZIhvcNAQkFMQ8XDTk4MTIwODE1MTU1MVowIwYJKoZIhvcNAQkEMRYEFLpmlINO Z1bHxWKZZuqFWXoqAhm+MDoGCSqGSIb3DQEJDzEtMCswCgYIKoZIhvcNAwcwDgYIKoZIhvcN AwICAgCAMA0GCCqGSIb3DQMCAgFAMA0GCSqGSIb3DQEBAQUABIGAXgdXybBg+THjLqyIQk7Q QpZZbNIp/jK5qUXCSdouNlscGzdTZSkfoZ29FnagmAXdLGKW8QMBekrD1dQsYPKhO7frotlQ 2BIJqG7WkRFSMsjhLW1Hw49nh6vjzAMDhACqXSJLamSzg8pzzw4HrR4ShYB0NXo8OetYC+KT m1P9Y64= --------------ms1124C2AA0B75FA377E8873F1--

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