From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Stringer Subject: [PATCH net-next v12 3/5] openvswitch: Use sw_flow_key_range for key ranges. Date: Thu, 15 Jan 2015 13:48:25 -0800 Message-ID: <1421358507-5992-4-git-send-email-joestringer@nicira.com> References: <1421358507-5992-1-git-send-email-joestringer@nicira.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1421358507-5992-1-git-send-email-joestringer-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org> 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 VGhlc2UgbWlub3IgdGlkeXVwcyBtYWtlIGEgZnV0dXJlIHBhdGNoIGEgbGl0dGxlIHRpZGllci4K ClNpZ25lZC1vZmYtYnk6IEpvZSBTdHJpbmdlciA8am9lc3RyaW5nZXJAbmljaXJhLmNvbT4KLS0t CiBuZXQvb3BlbnZzd2l0Y2gvZmxvd190YWJsZS5jIHwgICAyMCArKysrKysrKystLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvbmV0L29wZW52c3dpdGNoL2Zsb3dfdGFibGUuYyBiL25ldC9vcGVudnN3aXRjaC9m bG93X3RhYmxlLmMKaW5kZXggODFiOTc3ZC4uOWEzZjQxZiAxMDA2NDQKLS0tIGEvbmV0L29wZW52 c3dpdGNoL2Zsb3dfdGFibGUuYworKysgYi9uZXQvb3BlbnZzd2l0Y2gvZmxvd190YWJsZS5jCkBA IC0zNTcsOSArMzU3LDExIEBAIGludCBvdnNfZmxvd190YmxfZmx1c2goc3RydWN0IGZsb3dfdGFi bGUgKmZsb3dfdGFibGUpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB1MzIgZmxvd19oYXNoKGNv bnN0IHN0cnVjdCBzd19mbG93X2tleSAqa2V5LCBpbnQga2V5X3N0YXJ0LAotCQkgICAgIGludCBr ZXlfZW5kKQorc3RhdGljIHUzMiBmbG93X2hhc2goY29uc3Qgc3RydWN0IHN3X2Zsb3dfa2V5ICpr ZXksCisJCSAgICAgY29uc3Qgc3RydWN0IHN3X2Zsb3dfa2V5X3JhbmdlICpyYW5nZSkKIHsKKwlp bnQga2V5X3N0YXJ0ID0gcmFuZ2UtPnN0YXJ0OworCWludCBrZXlfZW5kID0gcmFuZ2UtPmVuZDsK IAljb25zdCB1MzIgKmhhc2hfa2V5ID0gKGNvbnN0IHUzMiAqKSgoY29uc3QgdTggKilrZXkgKyBr ZXlfc3RhcnQpOwogCWludCBoYXNoX3UzMnMgPSAoa2V5X2VuZCAtIGtleV9zdGFydCkgPj4gMjsK IApAQCAtMzk1LDkgKzM5Nyw5IEBAIHN0YXRpYyBib29sIGNtcF9rZXkoY29uc3Qgc3RydWN0IHN3 X2Zsb3dfa2V5ICprZXkxLAogCiBzdGF0aWMgYm9vbCBmbG93X2NtcF9tYXNrZWRfa2V5KGNvbnN0 IHN0cnVjdCBzd19mbG93ICpmbG93LAogCQkJCWNvbnN0IHN0cnVjdCBzd19mbG93X2tleSAqa2V5 LAotCQkJCWludCBrZXlfc3RhcnQsIGludCBrZXlfZW5kKQorCQkJCWNvbnN0IHN0cnVjdCBzd19m bG93X2tleV9yYW5nZSAqcmFuZ2UpCiB7Ci0JcmV0dXJuIGNtcF9rZXkoJmZsb3ctPmtleSwga2V5 LCBrZXlfc3RhcnQsIGtleV9lbmQpOworCXJldHVybiBjbXBfa2V5KCZmbG93LT5rZXksIGtleSwg cmFuZ2UtPnN0YXJ0LCByYW5nZS0+ZW5kKTsKIH0KIAogYm9vbCBvdnNfZmxvd19jbXBfdW5tYXNr ZWRfa2V5KGNvbnN0IHN0cnVjdCBzd19mbG93ICpmbG93LApAQCAtNDE2LDE4ICs0MTgsMTUgQEAg c3RhdGljIHN0cnVjdCBzd19mbG93ICptYXNrZWRfZmxvd19sb29rdXAoc3RydWN0IHRhYmxlX2lu c3RhbmNlICp0aSwKIHsKIAlzdHJ1Y3Qgc3dfZmxvdyAqZmxvdzsKIAlzdHJ1Y3QgaGxpc3RfaGVh ZCAqaGVhZDsKLQlpbnQga2V5X3N0YXJ0ID0gbWFzay0+cmFuZ2Uuc3RhcnQ7Ci0JaW50IGtleV9l bmQgPSBtYXNrLT5yYW5nZS5lbmQ7CiAJdTMyIGhhc2g7CiAJc3RydWN0IHN3X2Zsb3dfa2V5IG1h c2tlZF9rZXk7CiAKIAlvdnNfZmxvd19tYXNrX2tleSgmbWFza2VkX2tleSwgdW5tYXNrZWQsIG1h c2spOwotCWhhc2ggPSBmbG93X2hhc2goJm1hc2tlZF9rZXksIGtleV9zdGFydCwga2V5X2VuZCk7 CisJaGFzaCA9IGZsb3dfaGFzaCgmbWFza2VkX2tleSwgJm1hc2stPnJhbmdlKTsKIAloZWFkID0g ZmluZF9idWNrZXQodGksIGhhc2gpOwogCWhsaXN0X2Zvcl9lYWNoX2VudHJ5X3JjdShmbG93LCBo ZWFkLCBoYXNoX25vZGVbdGktPm5vZGVfdmVyXSkgewogCQlpZiAoZmxvdy0+bWFzayA9PSBtYXNr ICYmIGZsb3ctPmhhc2ggPT0gaGFzaCAmJgotCQkgICAgZmxvd19jbXBfbWFza2VkX2tleShmbG93 LCAmbWFza2VkX2tleSwKLQkJCQkJICBrZXlfc3RhcnQsIGtleV9lbmQpKQorCQkgICAgZmxvd19j bXBfbWFza2VkX2tleShmbG93LCAmbWFza2VkX2tleSwgJm1hc2stPnJhbmdlKSkKIAkJCXJldHVy biBmbG93OwogCX0KIAlyZXR1cm4gTlVMTDsKQEAgLTU5MCw4ICs1ODksNyBAQCBzdGF0aWMgdm9p ZCBmbG93X2tleV9pbnNlcnQoc3RydWN0IGZsb3dfdGFibGUgKnRhYmxlLCBzdHJ1Y3Qgc3dfZmxv dyAqZmxvdykKIAlzdHJ1Y3QgdGFibGVfaW5zdGFuY2UgKm5ld190aSA9IE5VTEw7CiAJc3RydWN0 IHRhYmxlX2luc3RhbmNlICp0aTsKIAotCWZsb3ctPmhhc2ggPSBmbG93X2hhc2goJmZsb3ctPmtl eSwgZmxvdy0+bWFzay0+cmFuZ2Uuc3RhcnQsCi0JCQlmbG93LT5tYXNrLT5yYW5nZS5lbmQpOwor CWZsb3ctPmhhc2ggPSBmbG93X2hhc2goJmZsb3ctPmtleSwgJmZsb3ctPm1hc2stPnJhbmdlKTsK IAl0aSA9IG92c2xfZGVyZWZlcmVuY2UodGFibGUtPnRpKTsKIAl0YWJsZV9pbnN0YW5jZV9pbnNl cnQodGksIGZsb3cpOwogCXRhYmxlLT5jb3VudCsrOwotLSAKMS43LjEwLjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRldiBtYWlsaW5nIGxpc3QKZGV2 QG9wZW52c3dpdGNoLm9yZwpodHRwOi8vb3BlbnZzd2l0Y2gub3JnL21haWxtYW4vbGlzdGluZm8v ZGV2Cg==