Date: Thu, 9 Aug 2012 03:32:28 -0600 From: PseudoCylon <moonlightakkiy@yahoo.ca> To: Kim Culhan <w8hdkim@gmail.com>, Adrian Chadd <adrian.chadd@gmail.com> Cc: freebsd-wireless@freebsd.org Subject: Re: (ANother) stall fixed, please update to HEAD Message-ID: <CAFZ_MYL%2BPJp=fZGY3HUuL%2BLtMGh1QaAMrEZsoig5sKoV=ESs=w@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--f46d0438945ffa6b6504c6d1e749 Content-Type: text/plain; charset=ISO-8859-1 > ------------------------------ > > Message: 5 > Date: Tue, 7 Aug 2012 12:34:52 -0400 > From: Kim Culhan <w8hdkim@gmail.com> > Subject: Re: (ANother) stall fixed, please update to HEAD > To: Adrian Chadd <adrian.chadd@gmail.com> > Cc: freebsd-wireless@freebsd.org > Message-ID: > <CAKZxVQVbKfW7WVuZjNFg5pGFu3Djzz=60FoSNTS83sz1zf72wQ@mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > >> Yup. Would you be able to work with PseudoCylon and test his >> ieee80211_iterate_nodes() patch? I'd like verification that it fixes >> it for you before I tidy it up and commit it to -HEAD. > > iter.patch and iter2.patch cannot be applied in that order > soo.. PseudoCylon could you please generate a diff > against -HEAD from your present local source? > No it won't. Only one of them need to apply. I guess I didn't explain well. iter.path only print outs debug message when the array overflowed (most unlikely it will). At this moment, this is what we need. iter2.patch does iter.patch + revert changes + abort iterating just for piece of mind. Probably this is unnecessary. The code need to be patched in the way the array won't overflow if it ever happens. (I leave it to committers what to commit.) The attached patch can be applied over iter.patch Sorry for the confusion. AK --f46d0438945ffa6b6504c6d1e749 Content-Type: application/octet-stream; name="addon.patch" Content-Disposition: attachment; filename="addon.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h5nmr6e50 ZGlmZiAtLWdpdCBhL2llZWU4MDIxMV9ub2RlLmMgYi9pZWVlODAyMTFfbm9kZS5jCmluZGV4IGE2 MDljYjEuLmExNWZjOTEgMTAwNjQ0Ci0tLSBhL2llZWU4MDIxMV9ub2RlLmMKKysrIGIvaWVlZTgw MjExX25vZGUuYwpAQCAtMjE2MCwxOCArMjE2MCwxOSBAQCBpZWVlODAyMTFfbm9kZV90aW1lb3V0 KHZvaWQgKmFyZykKICAqIE1heSBkaXJlY3RseSBiZSBjYWxsZWQgYW5kIGRvIGN1c3RvbWl6ZWQg aXRlcmF0ZSBmdW5jdGlvbnMuCiAgKiBPbmx5IHJlcXVpcmVtZW50IGlzIHRvIGRlY3JlbWVudCBl YWNoIG5vZGUncyByZWYgY291bnQuCiAgKi8KLXZvaWQKK2ludAogaWVlZTgwMjExX2l0ZXJhdGVf bnQoc3RydWN0IGllZWU4MDIxMV9ub2RlX3RhYmxlICpudCwKICAgICBzdHJ1Y3QgaWVlZTgwMjEx X25vZGUgKipuaV9hcnIsIHVpbnQxNl90IG1heF9haWQpCiB7CiAJc3RydWN0IGllZWU4MDIxMV9u b2RlICpuaTsKIAl1X2ludCBnZW47Ci0JaW50IGkgPSAwOworCWludCBpLCByZXQ7CiAKIAlJRUVF ODAyMTFfTk9ERV9JVEVSQVRFX0xPQ0sobnQpOwogCUlFRUU4MDIxMV9OT0RFX0xPQ0sobnQpOwog CiAJZ2VuID0gKytudC0+bnRfc2NhbmdlbjsKKwlpID0gcmV0ID0gMDsKIAogcmVzdGFydDoKIAlU QUlMUV9GT1JFQUNIKG5pLCAmbnQtPm50X25vZGUsIG5pX2xpc3QpIHsKQEAgLTIxNzksNiArMjE4 MCw3IEBAIHJlc3RhcnQ6CiAJCQljb250aW51ZTsKIAogCQlpZiAoaSA+PSBtYXhfYWlkKSB7CisJ CQlyZXQgPSBFMkJJRzsKIAkJCWlmX3ByaW50ZihudC0+bnRfaWMtPmljX2lmcCwKIAkJCSAgICAi Tm9kZSBhcnJheSBvdmVyZmxvdzogbWF4PSV1IiwgbWF4X2FpZCk7CiAJCQlicmVhazsKQEAgLTIx ODksOCArMjE5MSwyMSBAQCByZXN0YXJ0OgogCQlnb3RvIHJlc3RhcnQ7CiAJfQogCisJaWYgKHJl dCkgeworCQludC0+bnRfc2Nhbmdlbi0tOworCQlmb3IgKGkgPSAwOyBpIDwgbWF4X2FpZDsgaSsr KSB7CisJCQluaSA9ICoobmlfYXJyICsgaSk7CisJCQluaS0+bmlfc2Nhbmdlbi0tOworCQkJLyog bm9kZSBsb2NrIGlzIHJlY3Vyc2l2ZSAqLworCQkJaWVlZTgwMjExX2ZyZWVfbm9kZShuaSk7CisJ CX0KKwkJZnJlZShuaV9hcnIsIE1fODAyMTFfTk9ERSk7CisJfQorCiAJSUVFRTgwMjExX05PREVf VU5MT0NLKG50KTsKIAlJRUVFODAyMTFfTk9ERV9JVEVSQVRFX1VOTE9DSyhudCk7CisKKwlyZXR1 cm4gKHJldCk7CiB9CiAKIC8qCkBAIC0yMjE0LDcgKzIyMjksOCBAQCBpZWVlODAyMTFfaXRlcmF0 ZV9ub2RlcyhzdHJ1Y3QgaWVlZTgwMjExX25vZGVfdGFibGUgKm50LAogCWlmIChuaV9hcnIgPT0g TlVMTCkKIAkJcmV0dXJuOwogCi0JaWVlZTgwMjExX2l0ZXJhdGVfbnQobnQsIG5pX2FyciwgbWF4 X2FpZCk7CisJaWYgKCFpZWVlODAyMTFfaXRlcmF0ZV9udChudCwgbmlfYXJyLCBtYXhfYWlkKSkK KwkJcmV0dXJuOwogCiAJZm9yIChpID0gMDsgaSA8IG1heF9haWQ7IGkrKykgewogCQluaSA9ICoo bmlfYXJyICsgaSk7CmRpZmYgLS1naXQgYS9pZWVlODAyMTFfbm9kZS5oIGIvaWVlZTgwMjExX25v ZGUuaAppbmRleCAxZmJjODkyLi40OGVhZTJkIDEwMDY0NAotLS0gYS9pZWVlODAyMTFfbm9kZS5o CisrKyBiL2llZWU4MDIxMV9ub2RlLmgKQEAgLTQzOCw3ICs0MzgsNyBAQCBpbnQJaWVlZTgwMjEx X25vZGVfZGVsdWNhc3RrZXkoc3RydWN0IGllZWU4MDIxMV9ub2RlICopOwogdm9pZAlpZWVlODAy MTFfbm9kZV90aW1lb3V0KHZvaWQgKmFyZyk7CiAKIHR5cGVkZWYgdm9pZCBpZWVlODAyMTFfaXRl cl9mdW5jKHZvaWQgKiwgc3RydWN0IGllZWU4MDIxMV9ub2RlICopOwotdm9pZAlpZWVlODAyMTFf aXRlcmF0ZV9udChzdHJ1Y3QgaWVlZTgwMjExX25vZGVfdGFibGUgKiwKK2ludAlpZWVlODAyMTFf aXRlcmF0ZV9udChzdHJ1Y3QgaWVlZTgwMjExX25vZGVfdGFibGUgKiwKIAkJc3RydWN0IGllZWU4 MDIxMV9ub2RlICoqLCB1aW50MTZfdCk7CiB2b2lkCWllZWU4MDIxMV9pdGVyYXRlX25vZGVzKHN0 cnVjdCBpZWVlODAyMTFfbm9kZV90YWJsZSAqLAogCQlpZWVlODAyMTFfaXRlcl9mdW5jICosIHZv aWQgKik7Cg== --f46d0438945ffa6b6504c6d1e749--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFZ_MYL%2BPJp=fZGY3HUuL%2BLtMGh1QaAMrEZsoig5sKoV=ESs=w>