Date: Mon, 19 Feb 2018 16:41:20 +0100 From: Vincenzo Maffione <v.maffione@gmail.com> To: Navdeep Parhar <np@freebsd.org>, Matthew Macy <mmacy@nextbsd.org> Cc: FreeBSD Net <freebsd-net@freebsd.org> Subject: fix for some netmap drivers Message-ID: <CA%2B_eA9iUzCUj%2BRRsNVjO%2BaiOPbrLTS%2BDMerEMROgGJX2UH_eiw@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--001a114094da8e07f905659286cb Content-Type: text/plain; charset="UTF-8" Hello, Can anyone please apply the attached patch? It follows up the removal of the nkr_slot_flags in the upstream netmap. The change fixes compilation issues and has no effect on functionality. Thanks, Vincenzo -- Vincenzo Maffione --001a114094da8e07f905659286cb Content-Type: text/x-patch; charset="US-ASCII"; name="netmap-driver-fix.patch" Content-Disposition: attachment; filename="netmap-driver-fix.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jdue1va70 ZGlmZiAtLWdpdCBhL3N5cy9kZXYvY3hnYmUvdDRfbmV0bWFwLmMgYi9zeXMvZGV2L2N4Z2JlL3Q0 X25ldG1hcC5jCmluZGV4IGZhM2JiYjlmYzhmLi40NTA4M2ZiOWEzOSAxMDA2NDQKLS0tIGEvc3lz L2Rldi9jeGdiZS90NF9uZXRtYXAuYworKysgYi9zeXMvZGV2L2N4Z2JlL3Q0X25ldG1hcC5jCkBA IC05NzQsNyArOTc0LDcgQEAgdDRfbm1faW50cih2b2lkICphcmcpCiAJCQljYXNlIENQTF9SWF9Q S1Q6CiAJCQkJcmluZy0+c2xvdFtmbF9jaWR4XS5sZW4gPSBHX1JTUERfTEVOKGxxKSAtCiAJCQkJ ICAgIHNjLT5wYXJhbXMuc2dlLmZsX3BrdHNoaWZ0OwotCQkJCXJpbmctPnNsb3RbZmxfY2lkeF0u ZmxhZ3MgPSBrcmluZy0+bmtyX3Nsb3RfZmxhZ3M7CisJCQkJcmluZy0+c2xvdFtmbF9jaWR4XS5m bGFncyA9IDA7CiAJCQkJZmxfY2lkeCArPSAobHEgJiBGX1JTUERfTkVXQlVGKSA/IDEgOiAwOwog CQkJCWZsX2NyZWRpdHMgKz0gKGxxICYgRl9SU1BEX05FV0JVRikgPyAxIDogMDsKIAkJCQlpZiAo X19wcmVkaWN0X2ZhbHNlKGZsX2NpZHggPT0gbm1fcnhxLT5mbF9zaWR4KSkKZGlmZiAtLWdpdCBh L3N5cy9uZXQvaWZsaWIuYyBiL3N5cy9uZXQvaWZsaWIuYwppbmRleCBiYTdkMjU0N2VkMS4uNDRh Mjc2ZTY3ZDcgMTAwNjQ0Ci0tLSBhL3N5cy9uZXQvaWZsaWIuYworKysgYi9zeXMvbmV0L2lmbGli LmMKQEAgLTEwNjgsNyArMTA2OCw2IEBAIGlmbGliX25ldG1hcF9yeHN5bmMoc3RydWN0IG5ldG1h cF9rcmluZyAqa3JpbmcsIGludCBmbGFncykKIAlpZiAobmV0bWFwX25vX3BlbmRpbnRyIHx8IGZv cmNlX3VwZGF0ZSkgewogCQlpbnQgY3JjbGVuID0gaWZsaWJfY3Jjc3RyaXAgPyAwIDogNDsKIAkJ aW50IGVycm9yLCBhdmFpbDsKLQkJdWludDE2X3Qgc2xvdF9mbGFncyA9IGtyaW5nLT5ua3Jfc2xv dF9mbGFnczsKIAogCQlmb3IgKGkgPSAwOyBpIDwgcnhxLT5pZnJfbmZsOyBpKyspIHsKIAkJCWZs ID0gJnJ4cS0+aWZyX2ZsW2ldOwpAQCAtMTA4NCw3ICsxMDgzLDcgQEAgaWZsaWJfbmV0bWFwX3J4 c3luYyhzdHJ1Y3QgbmV0bWFwX2tyaW5nICprcmluZywgaW50IGZsYWdzKQogCiAJCQkJZXJyb3Ig PSBjdHgtPmlzY19yeGRfcGt0X2dldChjdHgtPmlmY19zb2Z0YywgJnJpKTsKIAkJCQlyaW5nLT5z bG90W25tX2ldLmxlbiA9IGVycm9yID8gMCA6IHJpLmlyaV9sZW4gLSBjcmNsZW47Ci0JCQkJcmlu Zy0+c2xvdFtubV9pXS5mbGFncyA9IHNsb3RfZmxhZ3M7CisJCQkJcmluZy0+c2xvdFtubV9pXS5m bGFncyA9IDA7CiAJCQkJaWYgKGZsLT5pZmxfc2RzLmlmc2RfbWFwKQogCQkJCQlidXNfZG1hbWFw X3N5bmMoZmwtPmlmbF9pZmRpLT5pZGlfdGFnLAogCQkJCQkJCWZsLT5pZmxfc2RzLmlmc2RfbWFw W25pY19pXSwgQlVTX0RNQVNZTkNfUE9TVFJFQUQpOwo= --001a114094da8e07f905659286cb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2B_eA9iUzCUj%2BRRsNVjO%2BaiOPbrLTS%2BDMerEMROgGJX2UH_eiw>