Date: Thu, 29 May 2008 19:45:31 -0400 From: Coleman Kane <cokane@FreeBSD.org> To: Andrew Thompson <thompsa@FreeBSD.org> Cc: current@FreeBSD.org Subject: Re: ndis(4) patch to replace obsolete if_watchdog interface Message-ID: <1212104731.1606.9.camel@localhost> In-Reply-To: <20080529214604.GA68753@citylink.fud.org.nz> References: <1212093692.1681.8.camel@localhost> <20080529214604.GA68753@citylink.fud.org.nz>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-TN+BhPvqyC6Eo6HkoYT6 Content-Type: multipart/mixed; boundary="=-IB5yhN5jxYpzNcLDCq6l" --=-IB5yhN5jxYpzNcLDCq6l Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Thu, 2008-05-29 at 14:46 -0700, Andrew Thompson wrote: > On Thu, May 29, 2008 at 04:41:32PM -0400, Coleman Kane wrote: > > Hi, > >=20 > > I just replaced the obsoleted if_watchdog interface in ndis(4) with a > > local implementation. This should remove the obnoxious warning message > > on device init. Anyone using -CURRENT with an ndis card, could you send > > me success/fails? > >=20 > > The patch is here: > > * http://people.freebsd.org/~cokane/patches/if_ndis-new_wd.patch >=20 >=20 > This works different to the rest of the network drivers. The existing > drivers use a callout tick that runs while the driver is up and an > integer counter. >=20 > if (x && --x =3D=3D 0) > ...timeout... >=20 > You arm the callout and stop it after each Tx, does this have any > perfornace impact? >=20 >=20 > Andrew >=20 I am attaching a new patch, where I use the method that you suggested and do away with the extra callout for the watchdog. A "tick" function was already implemented for timeouts related to the NDIS systems. I am not sure if the ndis-timeout code using ndis_stat_callout duplicates the if_watchdog code (and what I replaced it with), but I don't think so as both were implemented side-by-side before... --=20 Coleman Kane --=-IB5yhN5jxYpzNcLDCq6l Content-Disposition: attachment; filename=if_ndis-new_wd-2.patch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=if_ndis-new_wd-2.patch; charset=UTF-8 ZGlmZiAtLWdpdCBhL3N5cy9kZXYvaWZfbmRpcy9pZl9uZGlzLmMgYi9zeXMvZGV2L2lmX25kaXMv aWZfbmRpcy5jDQppbmRleCA5OTNmOWEyLi5iMDBkODJlIDEwMDY0NA0KLS0tIGEvc3lzL2Rldi9p Zl9uZGlzL2lmX25kaXMuYw0KKysrIGIvc3lzL2Rldi9pZl9uZGlzL2lmX25kaXMuYw0KQEAgLTE2 MSw3ICsxNjEsNyBAQCBzdGF0aWMgdm9pZCBuZGlzX3NjYW5fY3VyY2hhbgkoc3RydWN0IGllZWU4 MDIxMV9zY2FuX3N0YXRlICosIHVuc2lnbmVkIGxvbmcpOw0KIHN0YXRpYyB2b2lkIG5kaXNfc2Nh bl9taW5kd2VsbAkoc3RydWN0IGllZWU4MDIxMV9zY2FuX3N0YXRlICopOw0KIHN0YXRpYyB2b2lk IG5kaXNfaW5pdAkJKHZvaWQgKik7DQogc3RhdGljIHZvaWQgbmRpc19zdG9wCQkoc3RydWN0IG5k aXNfc29mdGMgKik7DQotc3RhdGljIHZvaWQgbmRpc193YXRjaGRvZwkoc3RydWN0IGlmbmV0ICop Ow0KK3N0YXRpYyB2b2lkIG5kaXNfd2F0Y2hkb2cJKHZvaWQgKik7DQogc3RhdGljIGludCBuZGlz X2lmbWVkaWFfdXBkCShzdHJ1Y3QgaWZuZXQgKik7DQogc3RhdGljIHZvaWQgbmRpc19pZm1lZGlh X3N0cwkoc3RydWN0IGlmbmV0ICosIHN0cnVjdCBpZm1lZGlhcmVxICopOw0KIHN0YXRpYyB2b2lk IG5kaXNfYXV0aAkJKHZvaWQgKiwgaW50KTsNCkBAIC02OTAsMTIgKzY5MCwxMyBAQCBuZGlzX2F0 dGFjaChkZXYpDQogCS8qIENoZWNrIGZvciB0YXNrIG9mZmxvYWQgc3VwcG9ydC4gKi8NCiAJbmRp c19wcm9iZV9vZmZsb2FkKHNjKTsNCiANCisJc2MtPm5kaXNfdGltZXJfY291bnRkb3duID0gMDsN CisNCiAJaWZfaW5pdG5hbWUoaWZwLCBkZXZpY2VfZ2V0X25hbWUoZGV2KSwgZGV2aWNlX2dldF91 bml0KGRldikpOw0KIAlpZnAtPmlmX210dSA9IEVUSEVSTVRVOw0KIAlpZnAtPmlmX2ZsYWdzID0g SUZGX0JST0FEQ0FTVCB8IElGRl9TSU1QTEVYIHwgSUZGX01VTFRJQ0FTVDsNCiAJaWZwLT5pZl9p b2N0bCA9IG5kaXNfaW9jdGw7DQogCWlmcC0+aWZfc3RhcnQgPSBuZGlzX3N0YXJ0Ow0KLQlpZnAt PmlmX3dhdGNoZG9nID0gbmRpc193YXRjaGRvZzsNCiAJaWZwLT5pZl9pbml0ID0gbmRpc19pbml0 Ow0KIAlpZnAtPmlmX2JhdWRyYXRlID0gMTAwMDAwMDA7DQogCUlGUV9TRVRfTUFYTEVOKCZpZnAt PmlmX3NuZCwgNTApOw0KQEAgLTk5NCwxMCArOTk1LDE0IEBAIG5kaXNfZGV0YWNoKGRldikNCiAJ ZHJpdmVyX29iamVjdAkJKmRydjsNCiANCiAJc2MgPSBkZXZpY2VfZ2V0X3NvZnRjKGRldik7DQor DQogCU5ESVNfTE9DSyhzYyk7DQogCWlmcCA9IHNjLT5pZnA7DQogCWlmcC0+aWZfZmxhZ3MgJj0g fklGRl9VUDsNCiANCisJLyogUmVtb3ZlIGFueSBwZW5kaW5nIGNhbGxvdXRzLiAqLw0KKwlzYy0+ bmRpc190aW1lcl9jb3VudGRvd24gPSAwOw0KKw0KIAlpZiAoZGV2aWNlX2lzX2F0dGFjaGVkKGRl dikpIHsNCiAJCU5ESVNfVU5MT0NLKHNjKTsNCiAJCW5kaXNfc3RvcChzYyk7DQpAQCAtMTU0MCw3 ICsxNTQ1LDcgQEAgbmRpc190eGVvZihhZGFwdGVyLCBwYWNrZXQsIHN0YXR1cykNCiAJZWxzZQ0K IAkJaWZwLT5pZl9vZXJyb3JzKys7DQogDQotCWlmcC0+aWZfdGltZXIgPSAwOw0KKwlzYy0+bmRp c190aW1lcl9jb3VudGRvd24gPSAwOw0KIAlpZnAtPmlmX2Rydl9mbGFncyAmPSB+SUZGX0RSVl9P QUNUSVZFOw0KIA0KIAlORElTX1VOTE9DSyhzYyk7DQpAQCAtMTY0OSw2ICsxNjU0LDE3IEBAIG5k aXNfdGljayh4c2MpDQogCWNhbGxvdXRfcmVzZXQoJnNjLT5uZGlzX3N0YXRfY2FsbG91dCwNCiAJ ICAgIGh6ICogc2MtPm5kaXNfYmxvY2stPm5tYl9jaGVja2ZvcmhhbmdzZWNzLCBuZGlzX3RpY2ss IHNjKTsNCiANCisJTkRJU19MT0NLKHNjKTsNCisJaWYoc2MtPm5kaXNfdGltZXJfY291bnRkb3du ICYmDQorCSAgICAoc2MtPm5kaXNfdGltZXJfY291bnRkb3duIC09DQorCSAgICBzYy0+bmRpc19i bG9jay0+bm1iX2NoZWNrZm9yaGFuZ3NlY3MpIDwgMSkgew0KKwkJc2MtPm5kaXNfdGltZXJfY291 bnRkb3duID0gMDsNCisJCU5ESVNfVU5MT0NLKHNjKTsNCisJCW5kaXNfd2F0Y2hkb2coeHNjKTsN CisJfSBlbHNlIHsNCisJCU5ESVNfVU5MT0NLKHNjKTsNCisJfQ0KKw0KIAlyZXR1cm47DQogfQ0K IA0KQEAgLTE4ODgsNyArMTkwNCw5IEBAIG5kaXNfc3RhcnQoaWZwKQ0KIAkvKg0KIAkgKiBTZXQg YSB0aW1lb3V0IGluIGNhc2UgdGhlIGNoaXAgZ29lcyBvdXQgdG8gbHVuY2guDQogCSAqLw0KLQlp ZnAtPmlmX3RpbWVyID0gNTsNCisJaWYoc2MtPm5kaXNfdGltZXJfY291bnRkb3duID09IDApIHsN CisJCXNjLT5uZGlzX3RpbWVyX2NvdW50ZG93biA9IDU7DQorCX0NCiANCiAJTkRJU19VTkxPQ0so c2MpOw0KIA0KQEAgLTE5ODMsNiArMjAwMSw5IEBAIG5kaXNfaW5pdCh4c2MpDQogCWlmcC0+aWZf ZHJ2X2ZsYWdzIHw9IElGRl9EUlZfUlVOTklORzsNCiAJaWZwLT5pZl9kcnZfZmxhZ3MgJj0gfklG Rl9EUlZfT0FDVElWRTsNCiANCisJLyogVGhlIHRpbWVvdXQgb24gdGhlIG9sZCBpZl93YXRjaGRv ZyBpbnRlcmZhY2UuICovDQorCXNjLT5uZGlzX3RpbWVyX2NvdW50ZG93biA9IDA7DQorDQogCU5E SVNfVU5MT0NLKHNjKTsNCiANCiAJLyogWFhYIGZvcmNlIGhhbmRsaW5nICovDQpAQCAtMzExMywx NSArMzEzNCwxMiBAQCBuZGlzX3Jlc2V0dGFzayhkLCBhcmcpDQogfQ0KIA0KIHN0YXRpYyB2b2lk DQotbmRpc193YXRjaGRvZyhpZnApDQotCXN0cnVjdCBpZm5ldAkJKmlmcDsNCituZGlzX3dhdGNo ZG9nICh2b2lkICphcmcpDQogew0KLQlzdHJ1Y3QgbmRpc19zb2Z0YwkJKnNjOw0KLQ0KLQlzYyA9 IGlmcC0+aWZfc29mdGM7DQorCXN0cnVjdCBuZGlzX3NvZnRjICpzYyA9IGFyZzsNCiANCiAJTkRJ U19MT0NLKHNjKTsNCi0JaWZwLT5pZl9vZXJyb3JzKys7DQorCXNjLT5pZnAtPmlmX29lcnJvcnMr KzsNCiAJZGV2aWNlX3ByaW50ZihzYy0+bmRpc19kZXYsICJ3YXRjaGRvZyB0aW1lb3V0XG4iKTsN CiAJTkRJU19VTkxPQ0soc2MpOw0KIA0KQEAgLTMxMzAsNyArMzE0OCw3IEBAIG5kaXNfd2F0Y2hk b2coaWZwKQ0KIAkgICAgV09SS1FVRVVFX0NSSVRJQ0FMLCBzYyk7DQogCUlvUXVldWVXb3JrSXRl bShzYy0+bmRpc19zdGFydGl0ZW0sDQogCSAgICAoaW9fd29ya2l0ZW1fZnVuYyluZGlzX3N0YXJ0 dGFza193cmFwLA0KLQkgICAgV09SS1FVRVVFX0NSSVRJQ0FMLCBpZnApOw0KKwkgICAgV09SS1FV RVVFX0NSSVRJQ0FMLCBzYy0+aWZwKTsNCiANCiAJcmV0dXJuOw0KIH0NCkBAIC0zMTUwLDcgKzMx NjgsNyBAQCBuZGlzX3N0b3Aoc2MpDQogCWNhbGxvdXRfZHJhaW4oJnNjLT5uZGlzX3N0YXRfY2Fs bG91dCk7DQogDQogCU5ESVNfTE9DSyhzYyk7DQotCWlmcC0+aWZfdGltZXIgPSAwOw0KKwlzYy0+ bmRpc190aW1lcl9jb3VudGRvd24gPSAwOw0KIAlzYy0+bmRpc19saW5rID0gMDsNCiAJaWZwLT5p Zl9kcnZfZmxhZ3MgJj0gfihJRkZfRFJWX1JVTk5JTkcgfCBJRkZfRFJWX09BQ1RJVkUpOw0KIAlO RElTX1VOTE9DSyhzYyk7DQpkaWZmIC0tZ2l0IGEvc3lzL2Rldi9pZl9uZGlzL2lmX25kaXN2YXIu aCBiL3N5cy9kZXYvaWZfbmRpcy9pZl9uZGlzdmFyLmgNCmluZGV4IGJmNGYwNTYuLmEyYjU4ZDEg MTAwNjQ0DQotLS0gYS9zeXMvZGV2L2lmX25kaXMvaWZfbmRpc3Zhci5oDQorKysgYi9zeXMvZGV2 L2lmX25kaXMvaWZfbmRpc3Zhci5oDQpAQCAtMTgxLDYgKzE4MSw3IEBAIHN0cnVjdCBuZGlzX3Nv ZnRjIHsNCiAJc3RydWN0IHRhc2sJCW5kaXNfYXNzb2N0YXNrOw0KIAlpbnQJCQkoKm5kaXNfbmV3 c3RhdGUpKHN0cnVjdCBpZWVlODAyMTFjb20gKiwNCiAJCQkJICAgIGVudW0gaWVlZTgwMjExX3N0 YXRlLCBpbnQpOw0KKwlpbnQJCQluZGlzX3RpbWVyX2NvdW50ZG93bjsNCiB9Ow0KIA0KICNkZWZp bmUgTkRJU19MT0NLKF9zYykJCUtlQWNxdWlyZVNwaW5Mb2NrKCYoX3NjKS0+bmRpc19zcGlubG9j aywgXA0K --=-IB5yhN5jxYpzNcLDCq6l-- --=-TN+BhPvqyC6Eo6HkoYT6 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEABECAAYFAkg/QBYACgkQcMSxQcXat5f9TACcDIrVmO/RL1Xp2hOM2+80wXoD LTkAn0/FBVe4DfBnKCwHuE00xRR8mCMc =ILtO -----END PGP SIGNATURE----- --=-TN+BhPvqyC6Eo6HkoYT6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1212104731.1606.9.camel>