From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Graf Subject: [PATCH net-next 04/22] ipv6: support for fib route lwtunnel encap attributes Date: Fri, 17 Jul 2015 14:55:23 +0200 Message-ID: <2a8eb31410d169a5ea197e5f9d6b5c79574ef580.1437137396.git.tgraf@suug.ch> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: roopa-qUQiAmfTcIp+XZJcv9eMoEEOCMrvLtNR@public.gmane.org, rshearma-43mecJUBy8ZBDgjK7y7TUQ@public.gmane.org, ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org, hannes-tFNcAqjVMyqKXQKiL6tip0B+6BGkLq7r@public.gmane.org, pshelar-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org, jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org, davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org, daniel-FeC+5ew28dpmcu3hnIyYJQ@public.gmane.org, tom-BjP2VixgY4xUbtYUoyoikg@public.gmane.org, edumazet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, jiri-rHqAuBHg3fBzbRFIqnYvSA@public.gmane.org, marcelo.leitner-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org, jpettit-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org, kaber-dcUjhNyLwpNeoWH0uzbU5w@public.gmane.org, simon.horman-wFxRvT7yatFl57MIdRCFDg@public.gmane.org, joestringer-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org, ja-FgGsKACvmQM@public.gmane.org, ast-uqk4Ao+rVK5Wk0Htik3J/w@public.gmane.org, weichunc-uqk4Ao+rVK5Wk0Htik3J/w@public.gmane.org Return-path: In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Sender: "dev" List-Id: netdev.vger.kernel.org RnJvbTogUm9vcGEgUHJhYmh1IDxyb29wYUBjdW11bHVzbmV0d29ya3MuY29tPgoKVGhpcyBwYXRj aCBhZGRzIHN1cHBvcnQgaW4gaXB2NiBmaWIgZnVuY3Rpb25zIHRvIHBhcnNlIE5ldGxpbmsKUlRB IGVuY2FwIGF0dHJpYnV0ZXMgYW5kIGF0dGFjaCBlbmNhcCBzdGF0ZSBkYXRhIHRvIHJ0Nl9pbmZv LgoKU2lnbmVkLW9mZi1ieTogUm9vcGEgUHJhYmh1IDxyb29wYUBjdW11bHVzbmV0d29ya3MuY29t PgotLS0KIGluY2x1ZGUvbmV0L2lwNl9maWIuaCB8ICAzICsrKwogbmV0L2lwdjYvaXA2X2ZpYi5j ICAgIHwgIDIgKysKIG5ldC9pcHY2L3JvdXRlLmMgICAgICB8IDMzICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbmV0L2lwNl9maWIuaCBiL2luY2x1ZGUv bmV0L2lwNl9maWIuaAppbmRleCAzYjc2ODQ5Li4yNzYzMjhlIDEwMDY0NAotLS0gYS9pbmNsdWRl L25ldC9pcDZfZmliLmgKKysrIGIvaW5jbHVkZS9uZXQvaXA2X2ZpYi5oCkBAIC01MSw2ICs1MSw4 IEBAIHN0cnVjdCBmaWI2X2NvbmZpZyB7CiAJc3RydWN0IG5sYXR0cgkqZmNfbXA7CiAKIAlzdHJ1 Y3QgbmxfaW5mbwlmY19ubGluZm87CisJc3RydWN0IG5sYXR0cgkqZmNfZW5jYXA7CisJdTE2CQlm Y19lbmNhcF90eXBlOwogfTsKIAogc3RydWN0IGZpYjZfbm9kZSB7CkBAIC0xMzEsNiArMTMzLDcg QEAgc3RydWN0IHJ0Nl9pbmZvIHsKIAkvKiBtb3JlIG5vbi1mcmFnbWVudCBzcGFjZSBhdCBoZWFk IHJlcXVpcmVkICovCiAJdW5zaWduZWQgc2hvcnQJCQlydDZpX25maGVhZGVyX2xlbjsKIAl1OAkJ CQlydDZpX3Byb3RvY29sOworCXN0cnVjdCBsd3R1bm5lbF9zdGF0ZQkJKnJ0NmlfbHd0c3RhdGU7 CiB9OwogCiBzdGF0aWMgaW5saW5lIHN0cnVjdCBpbmV0Nl9kZXYgKmlwNl9kc3RfaWRldihzdHJ1 Y3QgZHN0X2VudHJ5ICpkc3QpCmRpZmYgLS1naXQgYS9uZXQvaXB2Ni9pcDZfZmliLmMgYi9uZXQv aXB2Ni9pcDZfZmliLmMKaW5kZXggNTVkMTk4Ni4uZDcxNWYyZSAxMDA2NDQKLS0tIGEvbmV0L2lw djYvaXA2X2ZpYi5jCisrKyBiL25ldC9pcHY2L2lwNl9maWIuYwpAQCAtMzIsNiArMzIsNyBAQAog I2luY2x1ZGUgPG5ldC9pcHY2Lmg+CiAjaW5jbHVkZSA8bmV0L25kaXNjLmg+CiAjaW5jbHVkZSA8 bmV0L2FkZHJjb25mLmg+CisjaW5jbHVkZSA8bmV0L2x3dHVubmVsLmg+CiAKICNpbmNsdWRlIDxu ZXQvaXA2X2ZpYi5oPgogI2luY2x1ZGUgPG5ldC9pcDZfcm91dGUuaD4KQEAgLTE3Nyw2ICsxNzgs NyBAQCBzdGF0aWMgdm9pZCBydDZfZnJlZV9wY3B1KHN0cnVjdCBydDZfaW5mbyAqbm9uX3BjcHVf cnQpCiBzdGF0aWMgdm9pZCBydDZfcmVsZWFzZShzdHJ1Y3QgcnQ2X2luZm8gKnJ0KQogewogCWlm IChhdG9taWNfZGVjX2FuZF90ZXN0KCZydC0+cnQ2aV9yZWYpKSB7CisJCWx3dHVubmVsX3N0YXRl X3B1dChydC0+cnQ2aV9sd3RzdGF0ZSk7CiAJCXJ0Nl9mcmVlX3BjcHUocnQpOwogCQlkc3RfZnJl ZSgmcnQtPmRzdCk7CiAJfQpkaWZmIC0tZ2l0IGEvbmV0L2lwdjYvcm91dGUuYyBiL25ldC9pcHY2 L3JvdXRlLmMKaW5kZXggNjA5MDk2OS4uYjM0MzFiNyAxMDA2NDQKLS0tIGEvbmV0L2lwdjYvcm91 dGUuYworKysgYi9uZXQvaXB2Ni9yb3V0ZS5jCkBAIC01OCw2ICs1OCw3IEBACiAjaW5jbHVkZSA8 bmV0L25ldGV2ZW50Lmg+CiAjaW5jbHVkZSA8bmV0L25ldGxpbmsuaD4KICNpbmNsdWRlIDxuZXQv bmV4dGhvcC5oPgorI2luY2x1ZGUgPG5ldC9sd3R1bm5lbC5oPgogCiAjaW5jbHVkZSA8YXNtL3Vh Y2Nlc3MuaD4KIApAQCAtMTc3MCw2ICsxNzcxLDE3IEBAIGludCBpcDZfcm91dGVfYWRkKHN0cnVj dCBmaWI2X2NvbmZpZyAqY2ZnKQogCiAJcnQtPmRzdC5vdXRwdXQgPSBpcDZfb3V0cHV0OwogCisJ aWYgKGNmZy0+ZmNfZW5jYXApIHsKKwkJc3RydWN0IGx3dHVubmVsX3N0YXRlICpsd3RzdGF0ZTsK KworCQllcnIgPSBsd3R1bm5lbF9idWlsZF9zdGF0ZShkZXYsIGNmZy0+ZmNfZW5jYXBfdHlwZSwK KwkJCQkJICAgY2ZnLT5mY19lbmNhcCwgJmx3dHN0YXRlKTsKKwkJaWYgKGVycikKKwkJCWdvdG8g b3V0OworCQlsd3R1bm5lbF9zdGF0ZV9nZXQobHd0c3RhdGUpOworCQlydC0+cnQ2aV9sd3RzdGF0 ZSA9IGx3dHN0YXRlOworCX0KKwogCWlwdjZfYWRkcl9wcmVmaXgoJnJ0LT5ydDZpX2RzdC5hZGRy LCAmY2ZnLT5mY19kc3QsIGNmZy0+ZmNfZHN0X2xlbik7CiAJcnQtPnJ0NmlfZHN0LnBsZW4gPSBj ZmctPmZjX2RzdF9sZW47CiAJaWYgKHJ0LT5ydDZpX2RzdC5wbGVuID09IDEyOCkKQEAgLTI1OTUs NiArMjYwNyw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbmxhX3BvbGljeSBydG1faXB2Nl9wb2xp Y3lbUlRBX01BWCsxXSA9IHsKIAlbUlRBX01FVFJJQ1NdICAgICAgICAgICA9IHsgLnR5cGUgPSBO TEFfTkVTVEVEIH0sCiAJW1JUQV9NVUxUSVBBVEhdCQk9IHsgLmxlbiA9IHNpemVvZihzdHJ1Y3Qg cnRuZXh0aG9wKSB9LAogCVtSVEFfUFJFRl0gICAgICAgICAgICAgID0geyAudHlwZSA9IE5MQV9V OCB9LAorCVtSVEFfRU5DQVBfVFlQRV0JPSB7IC50eXBlID0gTkxBX1UxNiB9LAorCVtSVEFfRU5D QVBdCQk9IHsgLnR5cGUgPSBOTEFfTkVTVEVEIH0sCiB9OwogCiBzdGF0aWMgaW50IHJ0bV90b19m aWI2X2NvbmZpZyhzdHJ1Y3Qgc2tfYnVmZiAqc2tiLCBzdHJ1Y3Qgbmxtc2doZHIgKm5saCwKQEAg LTI2ODksNiArMjcwMywxMiBAQCBzdGF0aWMgaW50IHJ0bV90b19maWI2X2NvbmZpZyhzdHJ1Y3Qg c2tfYnVmZiAqc2tiLCBzdHJ1Y3Qgbmxtc2doZHIgKm5saCwKIAkJY2ZnLT5mY19mbGFncyB8PSBS VEZfUFJFRihwcmVmKTsKIAl9CiAKKwlpZiAodGJbUlRBX0VOQ0FQXSkKKwkJY2ZnLT5mY19lbmNh cCA9IHRiW1JUQV9FTkNBUF07CisKKwlpZiAodGJbUlRBX0VOQ0FQX1RZUEVdKQorCQljZmctPmZj X2VuY2FwX3R5cGUgPSBubGFfZ2V0X3UxNih0YltSVEFfRU5DQVBfVFlQRV0pOworCiAJZXJyID0g MDsKIGVycm91dDoKIAlyZXR1cm4gZXJyOwpAQCAtMjcyMSw2ICsyNzQxLDEwIEBAIGJlZ2lubmlu ZzoKIAkJCQlyX2NmZy5mY19nYXRld2F5ID0gbmxhX2dldF9pbjZfYWRkcihubGEpOwogCQkJCXJf Y2ZnLmZjX2ZsYWdzIHw9IFJURl9HQVRFV0FZOwogCQkJfQorCQkJcl9jZmcuZmNfZW5jYXAgPSBu bGFfZmluZChhdHRycywgYXR0cmxlbiwgUlRBX0VOQ0FQKTsKKwkJCW5sYSA9IG5sYV9maW5kKGF0 dHJzLCBhdHRybGVuLCBSVEFfRU5DQVBfVFlQRSk7CisJCQlpZiAobmxhKQorCQkJCXJfY2ZnLmZj X2VuY2FwX3R5cGUgPSBubGFfZ2V0X3UxNihubGEpOwogCQl9CiAJCWVyciA9IGFkZCA/IGlwNl9y b3V0ZV9hZGQoJnJfY2ZnKSA6IGlwNl9yb3V0ZV9kZWwoJnJfY2ZnKTsKIAkJaWYgKGVycikgewpA QCAtMjc4Myw3ICsyODA3LDcgQEAgc3RhdGljIGludCBpbmV0Nl9ydG1fbmV3cm91dGUoc3RydWN0 IHNrX2J1ZmYgKnNrYiwgc3RydWN0IG5sbXNnaGRyICpubGgpCiAJCXJldHVybiBpcDZfcm91dGVf YWRkKCZjZmcpOwogfQogCi1zdGF0aWMgaW5saW5lIHNpemVfdCBydDZfbmxtc2dfc2l6ZSh2b2lk KQorc3RhdGljIGlubGluZSBzaXplX3QgcnQ2X25sbXNnX3NpemUoc3RydWN0IHJ0Nl9pbmZvICpy dCkKIHsKIAlyZXR1cm4gTkxNU0dfQUxJR04oc2l6ZW9mKHN0cnVjdCBydG1zZykpCiAJICAgICAg ICsgbmxhX3RvdGFsX3NpemUoMTYpIC8qIFJUQV9TUkMgKi8KQEAgLTI3OTcsNyArMjgyMSw4IEBA IHN0YXRpYyBpbmxpbmUgc2l6ZV90IHJ0Nl9ubG1zZ19zaXplKHZvaWQpCiAJICAgICAgICsgUlRB WF9NQVggKiBubGFfdG90YWxfc2l6ZSg0KSAvKiBSVEFfTUVUUklDUyAqLwogCSAgICAgICArIG5s YV90b3RhbF9zaXplKHNpemVvZihzdHJ1Y3QgcnRhX2NhY2hlaW5mbykpCiAJICAgICAgICsgbmxh X3RvdGFsX3NpemUoVENQX0NBX05BTUVfTUFYKSAvKiBSVEFYX0NDX0FMR08gKi8KLQkgICAgICAg KyBubGFfdG90YWxfc2l6ZSgxKTsgLyogUlRBX1BSRUYgKi8KKwkgICAgICAgKyBubGFfdG90YWxf c2l6ZSgxKSAvKiBSVEFfUFJFRiAqLworCSAgICAgICArIGx3dHVubmVsX2dldF9lbmNhcF9zaXpl KHJ0LT5ydDZpX2x3dHN0YXRlKTsKIH0KIAogc3RhdGljIGludCBydDZfZmlsbF9ub2RlKHN0cnVj dCBuZXQgKm5ldCwKQEAgLTI5NDUsNiArMjk3MCw4IEBAIHN0YXRpYyBpbnQgcnQ2X2ZpbGxfbm9k ZShzdHJ1Y3QgbmV0ICpuZXQsCiAJaWYgKG5sYV9wdXRfdTgoc2tiLCBSVEFfUFJFRiwgSVBWNl9F WFRSQUNUX1BSRUYocnQtPnJ0NmlfZmxhZ3MpKSkKIAkJZ290byBubGFfcHV0X2ZhaWx1cmU7CiAK Kwlsd3R1bm5lbF9maWxsX2VuY2FwKHNrYiwgcnQtPnJ0NmlfbHd0c3RhdGUpOworCiAJbmxtc2df ZW5kKHNrYiwgbmxoKTsKIAlyZXR1cm4gMDsKIApAQCAtMzA3MSw3ICszMDk4LDcgQEAgdm9pZCBp bmV0Nl9ydF9ub3RpZnkoaW50IGV2ZW50LCBzdHJ1Y3QgcnQ2X2luZm8gKnJ0LCBzdHJ1Y3Qgbmxf aW5mbyAqaW5mbykKIAllcnIgPSAtRU5PQlVGUzsKIAlzZXEgPSBpbmZvLT5ubGggPyBpbmZvLT5u bGgtPm5sbXNnX3NlcSA6IDA7CiAKLQlza2IgPSBubG1zZ19uZXcocnQ2X25sbXNnX3NpemUoKSwg Z2ZwX2FueSgpKTsKKwlza2IgPSBubG1zZ19uZXcocnQ2X25sbXNnX3NpemUocnQpLCBnZnBfYW55 KCkpOwogCWlmICghc2tiKQogCQlnb3RvIGVycm91dDsKIAotLSAKMi40LjMKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRldiBtYWlsaW5nIGxpc3QKZGV2 QG9wZW52c3dpdGNoLm9yZwpodHRwOi8vb3BlbnZzd2l0Y2gub3JnL21haWxtYW4vbGlzdGluZm8v ZGV2Cg==