Date: Tue, 15 Jul 2014 11:19:38 +0200 From: Stefano Garzarella <stefanogarzarella@gmail.com> To: Borja Marcos <borjam@sarenet.es> Cc: "freebsd-net@freebsd.org" <freebsd-net@freebsd.org>, freebsd-current <freebsd-current@freebsd.org>, Luigi Rizzo <rizzo@iet.unipi.it>, Xin LI <d@delphij.net> Subject: Re: Fix Emulex "oce" driver in CURRENT Message-ID: <CAO0mX5a=VWG_bRhvpL3WCZjvbVRMY2hfgfRLc8qHAtVKO3=-2w@mail.gmail.com> In-Reply-To: <B8458978-1ACC-4083-B29C-E1DFFCFCA3EA@sarenet.es> References: <CA%2BhQ2%2BimE=%2BncZwpHGhWb175mYiAKV78MV=Dfc1GJf=3XYciPQ@mail.gmail.com> <453BA9EC-BB63-4258-8141-847F41315E1E@sarenet.es> <CA%2BhQ2%2BjaP2fuMaCoorLpGu=uWDPgHy3at5UdtLAOXM2d6uoWkg@mail.gmail.com> <6C8CF68D-68E2-4168-AA0A-6A629D363371@sarenet.es> <CAO0mX5bmXnQGuEgSYoBxy8bQK5i3B2MG0LBmJ7A178W1B5sqDw@mail.gmail.com> <EAE3F867-D084-43EC-962B-3F2EB5782C68@sarenet.es> <CAO0mX5Ys%2BraCwaQT0eB6jBFWGGAJ6kStsWPRVKOkfNdsP=17Kg@mail.gmail.com> <B8458978-1ACC-4083-B29C-E1DFFCFCA3EA@sarenet.es>
next in thread | previous in thread | raw e-mail | index | archive | help
--e89a8f8393fd2cd48c04fe37e814 Content-Type: text/plain; charset=UTF-8 I think there is some problem with the email formatting. I send you a file with both patches. Cheers, Stefano 2014-07-15 11:12 GMT+02:00 Borja Marcos <borjam@sarenet.es>: > > On Jul 15, 2014, at 10:43 AM, Stefano Garzarella wrote: > > > I used the "oce" driver in CURRENT. > > I think that this patch in combination with the previous one should work > in > > 10-STABLE. > > > > I have only tested if it works with CURRENT, but now I try if it works > with > > 10-STABLE and I'll send you some feedback. > > Hmmm. The patch seems to be broken. I have tried to apply it renaming the > a/usr/src... to oce_if.c.old and oce_if.c, etc, and patch complains: > > Patching file oce_if.c using Plan A... > patch: **** malformed patch at line 6: int wq_index); > > > Was it broken by the email client formatting? Or am I being especially > clumsy today? ;) > > > > > Borja. > > -- Stefano Garzarella --e89a8f8393fd2cd48c04fe37e814 Content-Type: application/octet-stream; name="oce_fix_STABLE10.patch" Content-Disposition: attachment; filename="oce_fix_STABLE10.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hxn0clrk0 ZGlmZiAtLWdpdCBhL3N5cy9kZXYvb2NlL29jZV9pZi5jIGIvc3lzL2Rldi9vY2Uvb2NlX2lmLmMK aW5kZXggNDhmODVlNi4uYzI5NWI4MCAxMDA2NDQKLS0tIGEvc3lzL2Rldi9vY2Uvb2NlX2lmLmMK KysrIGIvc3lzL2Rldi9vY2Uvb2NlX2lmLmMKQEAgLTE0Miw2ICsxNDIsNyBAQCBzdGF0aWMgaW50 ICBvY2VfdHgoUE9DRV9TT0ZUQyBzYywgc3RydWN0IG1idWYgKiptcHAsIGludCB3cV9pbmRleCk7 CiBzdGF0aWMgdm9pZCBvY2VfdHhfcmVzdGFydChQT0NFX1NPRlRDIHNjLCBzdHJ1Y3Qgb2NlX3dx ICp3cSk7CiBzdGF0aWMgdm9pZCBvY2VfdHhfY29tcGxldGUoc3RydWN0IG9jZV93cSAqd3EsIHVp bnQzMl90IHdxZV9pZHgsCiAJCQkJCXVpbnQzMl90IHN0YXR1cyk7CitzdGF0aWMgdm9pZCBvY2Vf dHhfY2xlYW4oUE9DRV9TT0ZUQyBzYyk7CiBzdGF0aWMgaW50ICBvY2VfbXVsdGlxX3RyYW5zbWl0 KHN0cnVjdCBpZm5ldCAqaWZwLCBzdHJ1Y3QgbWJ1ZiAqbSwKIAkJCQkgc3RydWN0IG9jZV93cSAq d3EpOwogCkBAIC01NjMsOSArNTY0LDYgQEAgb2NlX211bHRpcV9zdGFydChzdHJ1Y3QgaWZuZXQg KmlmcCwgc3RydWN0IG1idWYgKm0pCiAJaW50IHF1ZXVlX2luZGV4ID0gMDsKIAlpbnQgc3RhdHVz ID0gMDsKIAotCWlmICghc2MtPmxpbmtfc3RhdHVzKQotCQlyZXR1cm4gRU5YSU87Ci0KIAlpZiAo KG0tPm1fZmxhZ3MgJiBNX0ZMT1dJRCkgIT0gMCkKIAkJcXVldWVfaW5kZXggPSBtLT5tX3BrdGhk ci5mbG93aWQgJSBzYy0+bndxczsKIApAQCAtNTg4LDggKzU4NiwxMCBAQCBvY2VfbXVsdGlxX2Zs dXNoKHN0cnVjdCBpZm5ldCAqaWZwKQogCWludCBpID0gMDsKIAogCWZvciAoaSA9IDA7IGkgPCBz Yy0+bndxczsgaSsrKSB7CisJCUxPQ0soJnNjLT53cVtpXS0+dHhfbG9jayk7CiAJCXdoaWxlICgo bSA9IGJ1Zl9yaW5nX2RlcXVldWVfc2Moc2MtPndxW2ldLT5icikpICE9IE5VTEwpCiAJCQltX2Zy ZWVtKG0pOworCQlVTkxPQ0soJnNjLT53cVtpXS0+dHhfbG9jayk7CiAJfQogCWlmX3FmbHVzaChp ZnApOwogfQpAQCAtMTA1NSw2ICsxMDU1LDE5IEBAIG9jZV90eF9jb21wbGV0ZShzdHJ1Y3Qgb2Nl X3dxICp3cSwgdWludDMyX3Qgd3FlX2lkeCwgdWludDMyX3Qgc3RhdHVzKQogCX0KIH0KIAorc3Rh dGljIHZvaWQgCitvY2VfdHhfY2xlYW4oUE9DRV9TT0ZUQyBzYykgeworCWludCBpID0gMDsKKwlz dHJ1Y3Qgb2NlX3dxICp3cTsKKwkKKwlmb3JfYWxsX3dxX3F1ZXVlcyhzYywgd3EsIGkpIHsKKwkJ TE9DSygmd3EtPnR4X2xvY2spOworCQl3aGlsZSAod3EtPnBrdF9kZXNjX3RhaWwgIT0gd3EtPnBr dF9kZXNjX2hlYWQpIHsKKwkJCW9jZV90eF9jb21wbGV0ZSh3cSwgMCwgMCk7CisJCX0KKwkJVU5M T0NLKCZ3cS0+dHhfbG9jayk7CisJfQorfQogCiBzdGF0aWMgdm9pZAogb2NlX3R4X3Jlc3RhcnQo UE9DRV9TT0ZUQyBzYywgc3RydWN0IG9jZV93cSAqd3EpCkBAIC0xMjE2LDYgKzEyMjksOCBAQCBv Y2Vfd3FfaGFuZGxlcih2b2lkICphcmcpCiAJc3RydWN0IG9jZV9uaWNfdHhfY3FlICpjcWU7CiAJ aW50IG51bV9jcWVzID0gMDsKIAorCUxPQ0soJndxLT50eF9sb2NrKTsKKwogCWJ1c19kbWFtYXBf c3luYyhjcS0+cmluZy0+ZG1hLnRhZywKIAkJCWNxLT5yaW5nLT5kbWEubWFwLCBCVVNfRE1BU1lO Q19QT1NUV1JJVEUpOwogCWNxZSA9IFJJTkdfR0VUX0NPTlNVTUVSX0lURU1fVkEoY3EtPnJpbmcs IHN0cnVjdCBvY2VfbmljX3R4X2NxZSk7CkBAIC0xMjQwLDYgKzEyNTUsOCBAQCBvY2Vfd3FfaGFu ZGxlcih2b2lkICphcmcpCiAJaWYgKG51bV9jcWVzKQogCQlvY2VfYXJtX2NxKHNjLCBjcS0+Y3Ff aWQsIG51bV9jcWVzLCBGQUxTRSk7CiAKKwlVTkxPQ0soJndxLT50eF9sb2NrKTsKKwogCXJldHVy biAwOwogfQogCkBAIC0xMjc0LDcgKzEyOTEsNiBAQCBvY2VfbXVsdGlxX3RyYW5zbWl0KHN0cnVj dCBpZm5ldCAqaWZwLCBzdHJ1Y3QgbWJ1ZiAqbSwgc3RydWN0IG9jZV93cSAqd3EpCiAJCQkJZHJi cl9wdXRiYWNrKGlmcCwgYnIsIG5leHQpOwogCQkJCXdxLT50eF9zdGF0cy50eF9zdG9wcyArKzsK IAkJCQlpZnAtPmlmX2Rydl9mbGFncyB8PSBJRkZfRFJWX09BQ1RJVkU7Ci0JCQkJc3RhdHVzID0g ZHJicl9lbnF1ZXVlKGlmcCwgYnIsIG5leHQpOwogCQkJfSAgCiAJCQlicmVhazsKIAkJfQpAQCAt MTI4NSw3ICsxMzAxLDcgQEAgb2NlX211bHRpcV90cmFuc21pdChzdHJ1Y3QgaWZuZXQgKmlmcCwg c3RydWN0IG1idWYgKm0sIHN0cnVjdCBvY2Vfd3EgKndxKQogCQlFVEhFUl9CUEZfTVRBUChpZnAs IG5leHQpOwogCX0KIAotCXJldHVybiBzdGF0dXM7CisJcmV0dXJuIDA7CiB9CiAKIApAQCAtMjA5 MSw2ICsyMTA3LDkgQEAgb2NlX2lmX2RlYWN0aXZhdGUoUE9DRV9TT0ZUQyBzYykKIAkvKiBEZWxl dGUgUlggcXVldWUgaW4gY2FyZCB3aXRoIGZsdXNoIHBhcmFtICovCiAJb2NlX3N0b3Bfcngoc2Mp OwogCisJLyogRmx1c2ggdGhlIG1idWZzIHRoYXQgYXJlIHN0aWxsIGluIFRYIHF1ZXVlcyAqLwor CW9jZV90eF9jbGVhbihzYyk7CisKIAkvKiBJbnZhbGlkYXRlIGFueSBwZW5kaW5nIGNxIGFuZCBl cSBlbnRyaWVzKi8JCiAJZm9yX2FsbF9ldm50X3F1ZXVlcyhzYywgZXEsIGkpCQogCQlvY2VfZHJh aW5fZXEoZXEpOwpkaWZmIC0tZ2l0IGEvc3lzL2Rldi9vY2Uvb2NlX3F1ZXVlLmMgYi9zeXMvZGV2 L29jZS9vY2VfcXVldWUuYwppbmRleCAzMDhjMTZkLi4xNjEwMTFiIDEwMDY0NAotLS0gYS9zeXMv ZGV2L29jZS9vY2VfcXVldWUuYworKysgYi9zeXMvZGV2L29jZS9vY2VfcXVldWUuYwpAQCAtOTY5 LDcgKzk2OSw5IEBAIG9jZV9zdGFydF9ycShzdHJ1Y3Qgb2NlX3JxICpycSkKIGludAogb2NlX3N0 YXJ0X3dxKHN0cnVjdCBvY2Vfd3EgKndxKQogeworCUxPQ0soJndxLT50eF9sb2NrKTsgLyogWFhY OiBtYXliZSBub3QgbmVjZXNzYXJ5ICovCiAJb2NlX2FybV9jcSh3cS0+cGFyZW50LCB3cS0+Y3Et PmNxX2lkLCAwLCBUUlVFKTsKKwlVTkxPQ0soJndxLT50eF9sb2NrKTsKIAlyZXR1cm4gMDsKIH0K IApAQCAtMTA3Niw2ICsxMDc4LDggQEAgb2NlX2RyYWluX3dxX2NxKHN0cnVjdCBvY2Vfd3EgKndx KQogICAgICAgICBzdHJ1Y3Qgb2NlX25pY190eF9jcWUgKmNxZTsKICAgICAgICAgaW50IG51bV9j cWVzID0gMDsKIAorCUxPQ0soJndxLT50eF9sb2NrKTsgLyogWFhYOiBtYXliZSBub3QgbmVjZXNz YXJ5ICovCisKIAlidXNfZG1hbWFwX3N5bmMoY3EtPnJpbmctPmRtYS50YWcsIGNxLT5yaW5nLT5k bWEubWFwLAogCQkJCSBCVVNfRE1BU1lOQ19QT1NUV1JJVEUpOwogCkBAIC0xMDkzLDYgKzEwOTcs NyBAQCBvY2VfZHJhaW5fd3FfY3Eoc3RydWN0IG9jZV93cSAqd3EpCiAKIAlvY2VfYXJtX2NxKHNj LCBjcS0+Y3FfaWQsIG51bV9jcWVzLCBGQUxTRSk7CiAKKwlVTkxPQ0soJndxLT50eF9sb2NrKTsK IH0KIAogCg== --e89a8f8393fd2cd48c04fe37e814--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAO0mX5a=VWG_bRhvpL3WCZjvbVRMY2hfgfRLc8qHAtVKO3=-2w>