看板 DFBSD_bugs 關於我們 聯絡資訊
--===============1070432611== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Joe Talbott <josepht@cstone.net> added the comment: Please try the attached patch. ---------- assignedto: -> josepht nosy: +josepht priority: -> bug status: unread -> chatting _____________________________________________________ DragonFly issue tracker <bugs@lists.dragonflybsd.org> <http://bugs.dragonflybsd.org/issue1964> _____________________________________________________ --===============1070432611== Content-Type: application/octet-stream MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="iwn_serializer.patch" ZGlmZiAtLWdpdCBhL3N5cy9kZXYvbmV0aWYvaXduL2lmX2l3bi5jIGIvc3lzL2Rldi9uZXRpZi9p d24vaWZfaXduLmMKaW5kZXggY2RhOGUxNS4uODYxNTUzNiAxMDA2NDQKLS0tIGEvc3lzL2Rldi9u ZXRpZi9pd24vaWZfaXduLmMKKysrIGIvc3lzL2Rldi9uZXRpZi9pd24vaWZfaXduLmMKQEAgLTM0 MTcsNyArMzQxNyw3IEBAIGl3bl9pb2N0bChzdHJ1Y3QgaWZuZXQgKmlmcCwgdV9sb25nIGNtZCwg Y2FkZHJfdCBkYXRhLCBzdHJ1Y3QgdWNyZWQgKnVjcmVkKQogCWNhc2UgU0lPQ1NJRkZMQUdTOgog CQlpZiAoaWZwLT5pZl9mbGFncyAmIElGRl9VUCkgewogCQkJaWYgKCEoaWZwLT5pZl9mbGFncyAm IElGRl9SVU5OSU5HKSkgewotCQkJCWl3bl9pbml0X2xvY2tlZChzYyk7CisJCQkJaXduX2luaXQo c2MpOwogCQkJCWlmIChJV05fUkVBRChzYywgSVdOX0dQX0NOVFJMKSAmIElXTl9HUF9DTlRSTF9S RktJTEwpCiAJCQkJCXN0YXJ0YWxsID0gMTsKIAkJCQllbHNlCkBAIC0zNDI1LDcgKzM0MjUsNyBA QCBpd25faW9jdGwoc3RydWN0IGlmbmV0ICppZnAsIHVfbG9uZyBjbWQsIGNhZGRyX3QgZGF0YSwg c3RydWN0IHVjcmVkICp1Y3JlZCkKIAkJCX0KIAkJfSBlbHNlIHsKIAkJCWlmIChpZnAtPmlmX2Zs YWdzICYgSUZGX1JVTk5JTkcpCi0JCQkJaXduX3N0b3BfbG9ja2VkKHNjKTsKKwkJCQlpd25fc3Rv cChzYyk7CiAJCX0KIAkJaWYgKHN0YXJ0YWxsKQogCQkJaWVlZTgwMjExX3N0YXJ0X2FsbChpYyk7 CkBAIC02MTgwLDcgKzYxODAsOSBAQCBpd25faW5pdCh2b2lkICphcmcpCiAJc3RydWN0IGlmbmV0 ICppZnAgPSBzYy0+c2NfaWZwOwogCXN0cnVjdCBpZWVlODAyMTFjb20gKmljID0gaWZwLT5pZl9s MmNvbTsKIAorCXdsYW5fc2VyaWFsaXplX2VudGVyKCk7CiAJaXduX2luaXRfbG9ja2VkKHNjKTsK Kwl3bGFuX3NlcmlhbGl6ZV9leGl0KCk7CiAKIAlpZiAoaWZwLT5pZl9mbGFncyAmIElGRl9SVU5O SU5HKQogCQlpZWVlODAyMTFfc3RhcnRfYWxsKGljKTsKQEAgLTYyMDIsNyArNjIwNCw5IEBAIGl3 bl9zdG9wX2xvY2tlZChzdHJ1Y3QgaXduX3NvZnRjICpzYykKIHN0YXRpYyB2b2lkCiBpd25fc3Rv cChzdHJ1Y3QgaXduX3NvZnRjICpzYykKIHsKKwl3bGFuX3NlcmlhbGl6ZV9lbnRlcigpOwogCWl3 bl9zdG9wX2xvY2tlZChzYyk7CisJd2xhbl9zZXJpYWxpemVfZXhpdCgpOwogfQogCiAvKgpAQCAt NjMyOCw4ICs2MzMyLDggQEAgaXduX2h3X3Jlc2V0X3Rhc2sodm9pZCAqYXJnMCwgaW50IHBlbmRp bmcpCiAJd2xhbl9zZXJpYWxpemVfZW50ZXIoKTsKIAlpZnAgPSBzYy0+c2NfaWZwOwogCWljID0g aWZwLT5pZl9sMmNvbTsKLQlpd25fc3RvcChzYyk7Ci0JaXduX2luaXQoc2MpOworCWl3bl9zdG9w X2xvY2tlZChzYyk7CisJaXduX2luaXRfbG9ja2VkKHNjKTsKIAlpZWVlODAyMTFfbm90aWZ5X3Jh ZGlvKGljLCAxKTsKIAl3bGFuX3NlcmlhbGl6ZV9leGl0KCk7CiB9CkBAIC02MzQ3LDcgKzYzNTEs NyBAQCBpd25fcmFkaW9fb25fdGFzayh2b2lkICphcmcwLCBpbnQgcGVuZGluZykKIAlpYyA9IGlm cC0+aWZfbDJjb207CiAJdmFwID0gVEFJTFFfRklSU1QoJmljLT5pY192YXBzKTsKIAlpZiAodmFw ICE9IE5VTEwpIHsKLQkJaXduX2luaXQoc2MpOworCQlpd25faW5pdF9sb2NrZWQoc2MpOwogCQlp ZWVlODAyMTFfaW5pdCh2YXApOwogCX0KIAl3bGFuX3NlcmlhbGl6ZV9leGl0KCk7CkBAIC02MzY1 LDcgKzYzNjksNyBAQCBpd25fcmFkaW9fb2ZmX3Rhc2sodm9pZCAqYXJnMCwgaW50IHBlbmRpbmcp CiAJaWZwID0gc2MtPnNjX2lmcDsKIAlpYyA9IGlmcC0+aWZfbDJjb207CiAJdmFwID0gVEFJTFFf RklSU1QoJmljLT5pY192YXBzKTsKLQlpd25fc3RvcChzYyk7CisJaXduX3N0b3BfbG9ja2VkKHNj KTsKIAlpZiAodmFwICE9IE5VTEwpCiAJCWllZWU4MDIxMV9zdG9wKHZhcCk7CiAKQEAgLTY0MTYs NyArNjQyMCw3IEBAIGl3bl9wY2lfc3VzcGVuZChkZXZpY2VfdCBkZXYpCiAJc3RydWN0IGllZWU4 MDIxMXZhcCAqdmFwID0gVEFJTFFfRklSU1QoJmljLT5pY192YXBzKTsKIAogCXdsYW5fc2VyaWFs aXplX2VudGVyKCk7Ci0JaXduX3N0b3Aoc2MpOworCWl3bl9zdG9wX2xvY2tlZChzYyk7CiAJaWYg KHZhcCAhPSBOVUxMKQogCQlpZWVlODAyMTFfc3RvcCh2YXApOwogCXdsYW5fc2VyaWFsaXplX2V4 aXQoKTsKQEAgLTY0NDAsNyArNjQ0NCw3IEBAIGl3bl9wY2lfcmVzdW1lKGRldmljZV90IGRldikK IAlwY2lfd3JpdGVfY29uZmlnKGRldiwgMHg0MSwgMCwgMSk7CiAKIAlpZiAoaWZwLT5pZl9mbGFn cyAmIElGRl9VUCkgewotCQlpd25faW5pdChzYyk7CisJCWl3bl9pbml0X2xvY2tlZChzYyk7CiAJ CWlmICh2YXAgIT0gTlVMTCkKIAkJCWllZWU4MDIxMV9pbml0KHZhcCk7CiAJCWlmIChpZnAtPmlm X2ZsYWdzICYgSUZGX1JVTk5JTkcpCmRpZmYgLS1naXQgYS9zeXMva2Vybi91aXBjX21idWYuYyBi L3N5cy9rZXJuL3VpcGNfbWJ1Zi5jCmluZGV4IDQxNWM1NzguLjhlOWE3ZTQgMTAwNjQ0Ci0tLSBh L3N5cy9rZXJuL3VpcGNfbWJ1Zi5jCisrKyBiL3N5cy9rZXJuL3VpcGNfbWJ1Zi5jCkBAIC0yNTUs NiArMjU1LDcgQEAgaW50CW1fZGVmcmFncmFuZG9tZmFpbHVyZXM7CiBzdHJ1Y3Qgb2JqY2FjaGUg Km1idWZfY2FjaGUsICptYnVmcGhkcl9jYWNoZTsKIHN0cnVjdCBvYmpjYWNoZSAqbWNsbWV0YV9j YWNoZTsKIHN0cnVjdCBvYmpjYWNoZSAqbWJ1ZmNsdXN0ZXJfY2FjaGUsICptYnVmcGhkcmNsdXN0 ZXJfY2FjaGU7CitzdHJ1Y3Qgb2JqY2FjaGUgKm1idWZqY2x1c3Rlcl9jYWNoZTsKIAogaW50CW5t YmNsdXN0ZXJzOwogaW50CW5tYnVmczsKQEAgLTQ3MSw3ICs0NzIsNyBAQCBtY2xtZXRhX2R0b3Io dm9pZCAqb2JqLCB2b2lkICpwcml2YXRlKQogfQogCiBzdGF0aWMgdm9pZAotbGlua2NsdXN0ZXIo c3RydWN0IG1idWYgKm0sIHN0cnVjdCBtYmNsdXN0ZXIgKmNsKQorbGlua2pjbHVzdGVyKHN0cnVj dCBtYnVmICptLCBzdHJ1Y3QgbWJjbHVzdGVyICpjbCwgdWludCBzaXplKQogewogCS8qCiAJICog QWRkIHRoZSBjbHVzdGVyIHRvIHRoZSBtYnVmLiAgVGhlIGNhbGxlciB3aWxsIGRldGVjdCB0aGF0 IHRoZQpAQCAtNDgxLDEzICs0ODIsMTkgQEAgbGlua2NsdXN0ZXIoc3RydWN0IG1idWYgKm0sIHN0 cnVjdCBtYmNsdXN0ZXIgKmNsKQogCW0tPm1fZXh0LmV4dF9idWYgPSBjbC0+bWNsX2RhdGE7CiAJ bS0+bV9leHQuZXh0X3JlZiA9IG1fbWNscmVmOwogCW0tPm1fZXh0LmV4dF9mcmVlID0gbV9tY2xm cmVlOwotCW0tPm1fZXh0LmV4dF9zaXplID0gTUNMQllURVM7CisJbS0+bV9leHQuZXh0X3NpemUg PSBzaXplOwogCWF0b21pY19hZGRfaW50KCZjbC0+bWNsX3JlZnMsIDEpOwogCiAJbS0+bV9kYXRh ID0gbS0+bV9leHQuZXh0X2J1ZjsKIAltLT5tX2ZsYWdzIHw9IE1fRVhUIHwgTV9FWFRfQ0xVU1RF UjsKIH0KIAorc3RhdGljIHZvaWQKK2xpbmtjbHVzdGVyKHN0cnVjdCBtYnVmICptLCBzdHJ1Y3Qg bWJjbHVzdGVyICpjbCkKK3sKKwlsaW5ramNsdXN0ZXIobSwgY2wsIE1DTEJZVEVTKTsKK30KKwog c3RhdGljIGJvb2xlYW5fdAogbWJ1ZnBoZHJjbHVzdGVyX2N0b3Iodm9pZCAqb2JqLCB2b2lkICpw cml2YXRlLCBpbnQgb2NmbGFncykKIHsKQEAgLTUyMiw2ICs1MjksMjMgQEAgbWJ1ZmNsdXN0ZXJf Y3Rvcih2b2lkICpvYmosIHZvaWQgKnByaXZhdGUsIGludCBvY2ZsYWdzKQogCXJldHVybiAoVFJV RSk7CiB9CiAKK3N0YXRpYyBib29sZWFuX3QKK21idWZqY2x1c3Rlcl9jdG9yKHZvaWQgKm9iaiwg dm9pZCAqcHJpdmF0ZSwgaW50IG9jZmxhZ3MpCit7CisJc3RydWN0IG1idWYgKm0gPSBvYmo7CisJ c3RydWN0IG1iY2x1c3RlciAqY2w7CisKKwltYnVmX2N0b3Iob2JqLCBwcml2YXRlLCBvY2ZsYWdz KTsKKwljbCA9IG9iamNhY2hlX2dldChtY2xtZXRhX2NhY2hlLCBvY2ZsYWdzKTsKKwlpZiAoY2wg PT0gTlVMTCkgeworCQkrK21ic3RhdFtteWNwdS0+Z2RfY3B1aWRdLm1fZHJvcHM7CisJCXJldHVy biAoRkFMU0UpOworCX0KKwltLT5tX2ZsYWdzIHw9IE1fQ0xDQUNIRTsKKwlsaW5ramNsdXN0ZXIo bSwgY2wsIE1KVU1QQUdFU0laRSk7CisJcmV0dXJuIChUUlVFKTsKK30KKwogLyoKICAqIFVzZWQg Zm9yIGJvdGggdGhlIGNsdXN0ZXIgYW5kIGNsdXN0ZXIgUEhEUiBjYWNoZXMuCiAgKgpAQCAtNTYw LDYgKzU4NCw3IEBAIG1iaW5pdCh2b2lkICpkdW1teSkKIAkgKi8KIAlmb3IgKGkgPSAwOyBpIDwg bmNwdXM7IGkrKykgewogCQlhdG9taWNfc2V0X2xvbmdfbm9ubG9ja2VkKCZtYnN0YXRbaV0ubV9t c2l6ZSwgTVNJWkUpOworCQkvKiBYWFg6IGZpeCB0byBkZXBlbmQgb24gY2x1c3RlciBzaXplLiBK QVQgKi8KIAkJYXRvbWljX3NldF9sb25nX25vbmxvY2tlZCgmbWJzdGF0W2ldLm1fbWNsYnl0ZXMs IE1DTEJZVEVTKTsKIAkJYXRvbWljX3NldF9sb25nX25vbmxvY2tlZCgmbWJzdGF0W2ldLm1fbWlu Y2xzaXplLCBNSU5DTFNJWkUpOwogCQlhdG9taWNfc2V0X2xvbmdfbm9ubG9ja2VkKCZtYnN0YXRb aV0ubV9tbGVuLCBNTEVOKTsKQEAgLTYwMiw2ICs2MjcsMTIgQEAgbWJpbml0KHZvaWQgKmR1bW15 KQogCSAgICBvYmpjYWNoZV9tYWxsb2NfYWxsb2MsIG9iamNhY2hlX21hbGxvY19mcmVlLCAmbWJ1 Zl9tYWxsb2NfYXJncyk7CiAJbWJfbGltaXQgKz0gbGltaXQ7CiAKKwlsaW1pdCA9IG5tYmNsdXN0 ZXJzOworCW1idWZqY2x1c3Rlcl9jYWNoZSA9IG9iamNhY2hlX2NyZWF0ZSgibWJ1ZiArIGpjbHVz dGVyIiwgJmxpbWl0LCAwLAorCSAgICBtYnVmamNsdXN0ZXJfY3RvciwgbWJ1ZmNsdXN0ZXJfZHRv ciwgTlVMTCwKKwkgICAgb2JqY2FjaGVfbWFsbG9jX2FsbG9jLCBvYmpjYWNoZV9tYWxsb2NfZnJl ZSwgJm1idWZfbWFsbG9jX2FyZ3MpOworCW1iX2xpbWl0ICs9IGxpbWl0OworCiAJLyoKIAkgKiBB ZGp1c3QgYmFja2luZyBrbWFsbG9jIHBvb2xzJyBsaW1pdAogCSAqCkBAIC02MTEsNiArNjQyLDcg QEAgbWJpbml0KHZvaWQgKmR1bW15KQogCWNsX2xpbWl0ICs9IGNsX2xpbWl0IC8gODsKIAlrbWFs bG9jX3JhaXNlX2xpbWl0KG1jbG1ldGFfbWFsbG9jX2FyZ3MubXR5cGUsCiAJCQkgICAgbWNsbWV0 YV9tYWxsb2NfYXJncy5vYmpzaXplICogY2xfbGltaXQpOworCS8qIFhYWDogc2hvdWxkIGJlIGxh cmdlc3QgbV9idWZjbHVzdGVyIHNpemUuIEpBVCAqLwogCWttYWxsb2NfcmFpc2VfbGltaXQoTV9N QlVGQ0wsIE1DTEJZVEVTICogY2xfbGltaXQpOwogCiAJbWJfbGltaXQgKz0gbWJfbGltaXQgLyA4 OwpAQCAtNzc1LDYgKzgwNywxOCBAQCBtX2dldGNscihpbnQgaG93LCBpbnQgdHlwZSkKIAlyZXR1 cm4gKG0pOwogfQogCitzdHJ1Y3QgbWJ1ZiAqCittX2dldGpjbChpbnQgaG93LCBzaG9ydCB0eXBl LCBpbnQgZmxhZ3MsIHNpemVfdCBzaXplKQoreworCXN0cnVjdCBtYnVmICptID0gTlVMTDsKKyNp ZiAwCisJaW50IG9jZmxhZ3MgPSBNQlRPTShob3cpOworCWludCBudHJpZXMgPSAwOworI2VuZGlm IC8qIGlmIDAgKi8KKworCXJldHVybiAobSk7Cit9CisKIC8qCiAgKiBSZXR1cm5zIGFuIG1idWYg d2l0aCBhbiBhdHRhY2hlZCBjbHVzdGVyLgogICogQmVjYXVzZSBtYW55IG5ldHdvcmsgZHJpdmVy cyB1c2UgdGhpcyBraW5kIG9mIGJ1ZmZlcnMgYSBsb3QsIGl0IGlzCkBAIC0xNDAyLDYgKzE0NDYs NyBAQCBtX2R1cF9kYXRhKHN0cnVjdCBtYnVmICptLCBpbnQgaG93KQogCS8qCiAJICogT3B0aW1p emUgdGhlIG1idWYgYWxsb2NhdGlvbiBidXQgZG8gbm90IGdldCB0b28gY2FycmllZCBhd2F5Lgog CSAqLworCS8qIFhYWDogZml4IHRvIGRlcGVuZCBvbiBjbHVzdGVyIHNpemUuIEpBVCAqLwogCWlm IChtLT5tX25leHQgfHwgbS0+bV9sZW4gPiBNTEVOKQogCQlnc2l6ZSA9IE1DTEJZVEVTOwogCWVs c2UKZGlmZiAtLWdpdCBhL3N5cy9zeXMvbWJ1Zi5oIGIvc3lzL3N5cy9tYnVmLmgKaW5kZXggMzVl NDQ4ZS4uNjQ0NmYzYSAxMDA2NDQKLS0tIGEvc3lzL3N5cy9tYnVmLmgKKysrIGIvc3lzL3N5cy9t YnVmLmgKQEAgLTQ5Nyw2ICs0OTcsNyBAQCB2b2lkCQkgbV9mcmVlbShzdHJ1Y3QgbWJ1ZiAqKTsK IHN0cnVjdAltYnVmCSptX2dldChpbnQsIGludCk7CiBzdHJ1Y3QJbWJ1ZgkqbV9nZXRjKGludCBs ZW4sIGludCBob3csIGludCB0eXBlKTsKIHN0cnVjdAltYnVmCSptX2dldGNsKGludCBob3csIHNo b3J0IHR5cGUsIGludCBmbGFncyk7CitzdHJ1Y3QJbWJ1ZgkqbV9nZXRqY2woaW50IGhvdywgc2hv cnQgdHlwZSwgaW50IGZsYWdzLCB1aW50IHNpemUpOwogc3RydWN0CW1idWYJKm1fZ2V0Y2xyKGlu dCwgaW50KTsKIHN0cnVjdAltYnVmCSptX2dldGhkcihpbnQsIGludCk7CiBzdHJ1Y3QJbWJ1Zgkq bV9nZXRtKHN0cnVjdCBtYnVmICosIGludCwgaW50LCBpbnQpOwo= --===============1070432611==--