Date: Wed, 8 Jan 2003 10:57:00 -0800 (PST) From: Nate Lawson <nate@root.org> To: current@freebsd.org Cc: ryan beasley <ryanb@goddamnbastard.org>, rwatson@freebsd.org Subject: if_dc attach patch Message-ID: <Pine.BSF.4.21.0301081025220.18125-200000@root.org> In-Reply-To: <20030104074914.GS311@goddamnbastard.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --0-1499452765-1042052220=:18125 Content-Type: TEXT/PLAIN; charset=US-ASCII Here is an updated patch for dc. Can you try it? * Remove bogus locking * Move intr setup, ether_ifattach to end * add proper resource freeing to a case that missed it (!mac) * update resource freeing for error cases after intr move -Nate --0-1499452765-1042052220=:18125 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="dc_attach.diff" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.BSF.4.21.0301081057000.18125@root.org> Content-Description: Content-Disposition: attachment; filename="dc_attach.diff" SW5kZXg6IGlmX2RjLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBm aWxlOiAvaG9tZS9uY3ZzL3NyYy9zeXMvcGNpL2lmX2RjLmMsdg0KcmV0cmll dmluZyByZXZpc2lvbiAxLjg1DQpkaWZmIC11IC1yMS44NSBpZl9kYy5jDQot LS0gaWZfZGMuYwkyNyBOb3YgMjAwMiAwNzowNDoxMCAtMDAwMAkxLjg1DQor KysgaWZfZGMuYwk4IEphbiAyMDAzIDE4OjQ5OjIyIC0wMDAwDQpAQCAtMTky NywxMyArMTkyNywxMyBAQA0KIAlpZiAoIShjb21tYW5kICYgUENJTV9DTURf UE9SVEVOKSkgew0KIAkJcHJpbnRmKCJkYyVkOiBmYWlsZWQgdG8gZW5hYmxl IEkvTyBwb3J0cyFcbiIsIHVuaXQpOw0KIAkJZXJyb3IgPSBFTlhJTzsNCi0J CWdvdG8gZmFpbF9ub2xvY2s7DQorCQlnb3RvIGZhaWw7DQogCX0NCiAjZWxz ZQ0KIAlpZiAoIShjb21tYW5kICYgUENJTV9DTURfTUVNRU4pKSB7DQogCQlw cmludGYoImRjJWQ6IGZhaWxlZCB0byBlbmFibGUgbWVtb3J5IG1hcHBpbmch XG4iLCB1bml0KTsNCiAJCWVycm9yID0gRU5YSU87DQotCQlnb3RvIGZhaWxf bm9sb2NrOw0KKwkJZ290byBmYWlsOw0KIAl9DQogI2VuZGlmDQogDQpAQCAt MTk0NCwzNiArMTk0NCwxMiBAQA0KIAlpZiAoc2MtPmRjX3JlcyA9PSBOVUxM KSB7DQogCQlwcmludGYoImRjJWQ6IGNvdWxkbid0IG1hcCBwb3J0cy9tZW1v cnlcbiIsIHVuaXQpOw0KIAkJZXJyb3IgPSBFTlhJTzsNCi0JCWdvdG8gZmFp bF9ub2xvY2s7DQorCQlnb3RvIGZhaWw7DQogCX0NCiANCiAJc2MtPmRjX2J0 YWcgPSBybWFuX2dldF9idXN0YWcoc2MtPmRjX3Jlcyk7DQogCXNjLT5kY19i aGFuZGxlID0gcm1hbl9nZXRfYnVzaGFuZGxlKHNjLT5kY19yZXMpOw0KIA0K LQkvKiBBbGxvY2F0ZSBpbnRlcnJ1cHQgKi8NCi0JcmlkID0gMDsNCi0Jc2Mt PmRjX2lycSA9IGJ1c19hbGxvY19yZXNvdXJjZShkZXYsIFNZU19SRVNfSVJR LCAmcmlkLCAwLCB+MCwgMSwNCi0JICAgIFJGX1NIQVJFQUJMRSB8IFJGX0FD VElWRSk7DQotDQotCWlmIChzYy0+ZGNfaXJxID09IE5VTEwpIHsNCi0JCXBy aW50ZigiZGMlZDogY291bGRuJ3QgbWFwIGludGVycnVwdFxuIiwgdW5pdCk7 DQotCQlidXNfcmVsZWFzZV9yZXNvdXJjZShkZXYsIERDX1JFUywgRENfUklE LCBzYy0+ZGNfcmVzKTsNCi0JCWVycm9yID0gRU5YSU87DQotCQlnb3RvIGZh aWxfbm9sb2NrOw0KLQl9DQotDQotCWVycm9yID0gYnVzX3NldHVwX2ludHIo ZGV2LCBzYy0+ZGNfaXJxLCBJTlRSX1RZUEVfTkVUIHwgDQotCSAgICAoSVNf TVBTQUZFID8gSU5UUl9NUFNBRkUgOiAwKSwNCi0JICAgIGRjX2ludHIsIHNj LCAmc2MtPmRjX2ludHJoYW5kKTsNCi0NCi0JaWYgKGVycm9yKSB7DQotCQli dXNfcmVsZWFzZV9yZXNvdXJjZShkZXYsIFNZU19SRVNfSVJRLCAwLCBzYy0+ ZGNfaXJxKTsNCi0JCWJ1c19yZWxlYXNlX3Jlc291cmNlKGRldiwgRENfUkVT LCBEQ19SSUQsIHNjLT5kY19yZXMpOw0KLQkJcHJpbnRmKCJkYyVkOiBjb3Vs ZG4ndCBzZXQgdXAgaXJxXG4iLCB1bml0KTsNCi0JCWdvdG8gZmFpbF9ub2xv Y2s7DQotCX0NCi0JRENfTE9DSyhzYyk7DQotDQogCS8qIE5lZWQgdGhpcyBp bmZvIHRvIGRlY2lkZSBvbiBhIGNoaXAgdHlwZS4gKi8NCiAJc2MtPmRjX2lu Zm8gPSBkY19kZXZ0eXBlKGRldik7DQogCXJldmlzaW9uID0gcGNpX3JlYWRf Y29uZmlnKGRldiwgRENfUENJX0NGUlYsIDQpICYgMHgwMDAwMDBGRjsNCkBA IC0yMTYyLDYgKzIxMzgsOCBAQA0KIAkJbWFjID0gcGNpX2dldF9ldGhlcihk ZXYpOw0KIAkJaWYgKCFtYWMpIHsNCiAJCQlkZXZpY2VfcHJpbnRmKGRldiwg Ik5vIHN0YXRpb24gYWRkcmVzcyBpbiBDSVMhXG4iKTsNCisJCQlidXNfcmVs ZWFzZV9yZXNvdXJjZShkZXYsIERDX1JFUywgRENfUklELCBzYy0+ZGNfcmVz KTsNCisJCQllcnJvciA9IEVOWElPOw0KIAkJCWdvdG8gZmFpbDsNCiAJCX0N CiAJCWJjb3B5KG1hYywgZWFkZHIsIEVUSEVSX0FERFJfTEVOKTsNCkBAIC0y MTg0LDggKzIxNjIsNiBAQA0KIA0KIAlpZiAoc2MtPmRjX2xkYXRhID09IE5V TEwpIHsNCiAJCXByaW50ZigiZGMlZDogbm8gbWVtb3J5IGZvciBsaXN0IGJ1 ZmZlcnMhXG4iLCB1bml0KTsNCi0JCWJ1c190ZWFyZG93bl9pbnRyKGRldiwg c2MtPmRjX2lycSwgc2MtPmRjX2ludHJoYW5kKTsNCi0JCWJ1c19yZWxlYXNl X3Jlc291cmNlKGRldiwgU1lTX1JFU19JUlEsIDAsIHNjLT5kY19pcnEpOw0K IAkJYnVzX3JlbGVhc2VfcmVzb3VyY2UoZGV2LCBEQ19SRVMsIERDX1JJRCwg c2MtPmRjX3Jlcyk7DQogCQllcnJvciA9IEVOWElPOw0KIAkJZ290byBmYWls Ow0KQEAgLTIyNDUsOCArMjIyMSw2IEBADQogDQogCWlmIChlcnJvcikgew0K IAkJcHJpbnRmKCJkYyVkOiBNSUkgd2l0aG91dCBhbnkgUEhZIVxuIiwgc2Mt PmRjX3VuaXQpOw0KLQkJYnVzX3RlYXJkb3duX2ludHIoZGV2LCBzYy0+ZGNf aXJxLCBzYy0+ZGNfaW50cmhhbmQpOw0KLQkJYnVzX3JlbGVhc2VfcmVzb3Vy Y2UoZGV2LCBTWVNfUkVTX0lSUSwgMCwgc2MtPmRjX2lycSk7DQogCQlidXNf cmVsZWFzZV9yZXNvdXJjZShkZXYsIERDX1JFUywgRENfUklELCBzYy0+ZGNf cmVzKTsNCiAJCWVycm9yID0gRU5YSU87DQogCQlnb3RvIGZhaWw7DQpAQCAt MjI2NiwxMSArMjI0MCw2IEBADQogCX0NCiANCiAJLyoNCi0JICogQ2FsbCBN SSBhdHRhY2ggcm91dGluZS4NCi0JICovDQotCWV0aGVyX2lmYXR0YWNoKGlm cCwgZWFkZHIpOw0KLQ0KLQkvKg0KIAkgKiBUZWxsIHRoZSB1cHBlciBsYXll cihzKSB3ZSBzdXBwb3J0IGxvbmcgZnJhbWVzLg0KIAkgKi8NCiAJaWZwLT5p Zl9kYXRhLmlmaV9oZHJsZW4gPSBzaXplb2Yoc3RydWN0IGV0aGVyX3ZsYW5f aGVhZGVyKTsNCkBAIC0yMzA0LDE0ICsyMjczLDM3IEBADQogCX0NCiAjZW5k aWYNCiANCi0JRENfVU5MT0NLKHNjKTsNCi0JcmV0dXJuKDApOw0KKwkvKg0K KwkgKiBDYWxsIE1JIGF0dGFjaCByb3V0aW5lLg0KKwkgKi8NCisJZXRoZXJf aWZhdHRhY2goaWZwLCBlYWRkcik7DQorDQorCS8qIEFsbG9jYXRlIGludGVy cnVwdCAqLw0KKwlyaWQgPSAwOw0KKwlzYy0+ZGNfaXJxID0gYnVzX2FsbG9j X3Jlc291cmNlKGRldiwgU1lTX1JFU19JUlEsICZyaWQsIDAsIH4wLCAxLA0K KwkgICAgUkZfU0hBUkVBQkxFIHwgUkZfQUNUSVZFKTsNCisNCisJaWYgKHNj LT5kY19pcnEgPT0gTlVMTCkgew0KKwkJcHJpbnRmKCJkYyVkOiBjb3VsZG4n dCBtYXAgaW50ZXJydXB0XG4iLCB1bml0KTsNCisJCWJ1c19yZWxlYXNlX3Jl c291cmNlKGRldiwgRENfUkVTLCBEQ19SSUQsIHNjLT5kY19yZXMpOw0KKwkJ ZXJyb3IgPSBFTlhJTzsNCisJCWdvdG8gZmFpbDsNCisJfQ0KKw0KKwllcnJv ciA9IGJ1c19zZXR1cF9pbnRyKGRldiwgc2MtPmRjX2lycSwgSU5UUl9UWVBF X05FVCB8IA0KKwkgICAgKElTX01QU0FGRSA/IElOVFJfTVBTQUZFIDogMCks DQorCSAgICBkY19pbnRyLCBzYywgJnNjLT5kY19pbnRyaGFuZCk7DQorDQor CWlmIChlcnJvcikgew0KKwkJYnVzX3JlbGVhc2VfcmVzb3VyY2UoZGV2LCBT WVNfUkVTX0lSUSwgMCwgc2MtPmRjX2lycSk7DQorCQlidXNfcmVsZWFzZV9y ZXNvdXJjZShkZXYsIERDX1JFUywgRENfUklELCBzYy0+ZGNfcmVzKTsNCisJ CXByaW50ZigiZGMlZDogY291bGRuJ3Qgc2V0IHVwIGlycVxuIiwgdW5pdCk7 DQorCX0NCiANCiBmYWlsOg0KLQlEQ19VTkxPQ0soc2MpOw0KLWZhaWxfbm9s b2NrOg0KLQltdHhfZGVzdHJveSgmc2MtPmRjX210eCk7DQotCXJldHVybihl cnJvcik7DQorCWlmIChlcnJvciAhPSAwKQ0KKwkJbXR4X2Rlc3Ryb3koJnNj LT5kY19tdHgpOw0KKwlyZXR1cm4gKGVycm9yKTsNCiB9DQogDQogc3RhdGlj IGludA0K --0-1499452765-1042052220=:18125-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0301081025220.18125-200000>