From owner-freebsd-net@freebsd.org Mon Feb 19 15:41:22 2018 Return-Path: Delivered-To: freebsd-net@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4D58F094B8 for ; Mon, 19 Feb 2018 15:41:21 +0000 (UTC) (envelope-from v.maffione@gmail.com) Received: from mail-qt0-x22b.google.com (mail-qt0-x22b.google.com [IPv6:2607:f8b0:400d:c0d::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5A1DF7AB5E; Mon, 19 Feb 2018 15:41:21 +0000 (UTC) (envelope-from v.maffione@gmail.com) Received: by mail-qt0-x22b.google.com with SMTP id f4so12702987qtj.6; Mon, 19 Feb 2018 07:41:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=QviTMNJKqGBfZ65pdjT9iYFIeeVuOV+gCBfubS/IajE=; b=ER7BaFFEcQpGz/dD47Z7WYvlsb8h0IjE5wuYhlOINhp8NuUfWO66LRIjkAuYWNIghd hicZY3PI0cITgtux+9JXzWE1yR9DH+Yzg4P/1Fd1utQrq2NZKGE0kGCYd2k5CwWW1w8R LAdF46u2v1dFmO69jHrrXIQb8MscuvGaKM5FE8eZ+y+VxQKNbPRpI7S8PL8U3F/bLCWS PbcSr7iSTl9AFl3mO+LYWslnQYAbK9hqQNY1f71wlpOwwJv+/lb7ZMe59R+x0uWOHeal KclrcqSnkQVXI/QSIV5SRUKmc9OMP78utLWfH9XAUTY5euA7eLXgWgJu/LDzSyFC7lLm WFsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=QviTMNJKqGBfZ65pdjT9iYFIeeVuOV+gCBfubS/IajE=; b=IwEEbMkds824ULGw33f+k+Q4I2jx8HF/4425ldZk2HzS4L8A9sgdMmiqDJstDeEgQp q2sNzsJqolOocNRUpIPHnWq+DTERzEK5iY1ZJwVSt2m6Z1D2H1RclN5+D8QMhNaCKquP Tt0Z2RdUlb2qTyUUVXwEN4UiEctZ+RV37Mrh6uOGiwJjj9FMkdWG0LmhHyhgYlWFoWbO 6XrlOdcyrcigjlYKi8dcnffvARTsbPN5np4/QsTrgQkdvEIVQQncTG6pt/gTcW6xGO6X BrmTj9Rq9GzVe7sq+Zn7tpmm2XNCLqFvArRnB9alFLeCu9hLNB7huLcmFwUNKlcZTI8N 8VfA== X-Gm-Message-State: APf1xPCRks3nEZxdtI2xYG5Br1FqS1c8A2VVcQeiN3TNIE4opeWR0lQe lIKSqalQqpU2K+uCpgomjWUCmKqk0LR9ubxY5STLKA== X-Google-Smtp-Source: AH8x224i+5o6gu3RzQFGd2/rV3zMxcYL8lI3mSg/ruBoHGWysSYs4gXLPLfPuCZBySjR20kntYbrxYOsbszRR91Ydys= X-Received: by 10.200.55.146 with SMTP id d18mr25177818qtc.61.1519054880629; Mon, 19 Feb 2018 07:41:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.12.170.90 with HTTP; Mon, 19 Feb 2018 07:41:20 -0800 (PST) From: Vincenzo Maffione Date: Mon, 19 Feb 2018 16:41:20 +0100 Message-ID: Subject: fix for some netmap drivers To: Navdeep Parhar , Matthew Macy Cc: FreeBSD Net Content-Type: multipart/mixed; boundary="001a114094da8e07f905659286cb" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Feb 2018 15:41:22 -0000 --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--