From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Garver <e@erig.me>
Subject: [PATCH net-next v21 2/4] vlan: Check for vlan ethernet
	types for 8021.q or 802.1ad
Date: Thu,  1 Sep 2016 16:45:25 -0400
Message-ID: <1472762727-25844-3-git-send-email-e@erig.me>
References: <1472762727-25844-1-git-send-email-e@erig.me>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org, Thomas F Herbert <thomasfherbert-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Return-path: <dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org>
In-Reply-To: <1472762727-25844-1-git-send-email-e-jCUjZXiOoP8@public.gmane.org>
List-Unsubscribe: <http://openvswitch.org/mailman/options/dev>,
 <mailto:dev-request-yBygre7rU0TnMu66kgdUjQ@public.gmane.org?subject=unsubscribe>
List-Archive: <http://openvswitch.org/pipermail/dev>
List-Post: <mailto:dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org>
List-Help: <mailto:dev-request-yBygre7rU0TnMu66kgdUjQ@public.gmane.org?subject=help>
List-Subscribe: <http://openvswitch.org/mailman/listinfo/dev>,
 <mailto:dev-request-yBygre7rU0TnMu66kgdUjQ@public.gmane.org?subject=subscribe>
Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org
Sender: "dev" <dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org>
List-Id: netdev.vger.kernel.org

VGhpcyBpcyB0byBzaW1wbGlmeSB1c2luZyBkb3VibGUgdGFnZ2VkIHZsYW5zLiBUaGlzIGZ1bmN0
aW9uIGFsbG93cyBhbGwKdmFsaWQgdmxhbiBldGhlcnR5cGVzIHRvIGJlIGNoZWNrZWQgaW4gYSBz
aW5nbGUgZnVuY3Rpb24gY2FsbC4KQWxzbyByZXBsYWNlIHNvbWUgaW5zdGFuY2VzIHRoYXQgY2hl
Y2sgZm9yIGJvdGggRVRIX1BfODAyMVEgYW5kCkVUSF9QXzgwMjFBRC4KClBhdGNoIGJhc2VkIG9u
IG9uZSBvcmlnaW5hbGx5IGJ5IFRob21hcyBGIEhlcmJlcnQuCgpTaWduZWQtb2ZmLWJ5OiBUaG9t
YXMgRiBIZXJiZXJ0IDx0aG9tYXNmaGVyYmVydEBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IEVy
aWMgR2FydmVyIDxlQGVyaWcubWU+Ci0tLQogaW5jbHVkZS9saW51eC9pZl92bGFuLmggfCAzMyAr
KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNl
cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2lm
X3ZsYW4uaCBiL2luY2x1ZGUvbGludXgvaWZfdmxhbi5oCmluZGV4IDQ5ZDRhZWYxZjc4OS4uMzMx
OWQ5N2Q3ODlkIDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2lmX3ZsYW4uaAorKysgYi9pbmNs
dWRlL2xpbnV4L2lmX3ZsYW4uaApAQCAtMjcyLDYgKzI3MiwyMyBAQCBzdGF0aWMgaW5saW5lIGlu
dCB2bGFuX2dldF9lbmNhcF9sZXZlbChzdHJ1Y3QgbmV0X2RldmljZSAqZGV2KQogfQogI2VuZGlm
CiAKKy8qKgorICogZXRoX3R5cGVfdmxhbiAtIGNoZWNrIGZvciB2YWxpZCB2bGFuIGV0aGVyIHR5
cGUuCisgKiBAZXRoZXJ0eXBlOiBldGhlciB0eXBlIHRvIGNoZWNrCisgKgorICogUmV0dXJucyB0
cnVlIGlmIHRoZSBldGhlciB0eXBlIGlzIGEgdmxhbiBldGhlciB0eXBlLgorICovCitzdGF0aWMg
aW5saW5lIGJvb2wgZXRoX3R5cGVfdmxhbihfX2JlMTYgZXRoZXJ0eXBlKQoreworCXN3aXRjaCAo
ZXRoZXJ0eXBlKSB7CisJY2FzZSBodG9ucyhFVEhfUF84MDIxUSk6CisJY2FzZSBodG9ucyhFVEhf
UF84MDIxQUQpOgorCQlyZXR1cm4gdHJ1ZTsKKwlkZWZhdWx0OgorCQlyZXR1cm4gZmFsc2U7CisJ
fQorfQorCiBzdGF0aWMgaW5saW5lIGJvb2wgdmxhbl9od19vZmZsb2FkX2NhcGFibGUobmV0ZGV2
X2ZlYXR1cmVzX3QgZmVhdHVyZXMsCiAJCQkJCSAgIF9fYmUxNiBwcm90bykKIHsKQEAgLTQyNSw4
ICs0NDIsNyBAQCBzdGF0aWMgaW5saW5lIGludCBfX3ZsYW5fZ2V0X3RhZyhjb25zdCBzdHJ1Y3Qg
c2tfYnVmZiAqc2tiLCB1MTYgKnZsYW5fdGNpKQogewogCXN0cnVjdCB2bGFuX2V0aGhkciAqdmV0
aCA9IChzdHJ1Y3Qgdmxhbl9ldGhoZHIgKilza2ItPmRhdGE7CiAKLQlpZiAodmV0aC0+aF92bGFu
X3Byb3RvICE9IGh0b25zKEVUSF9QXzgwMjFRKSAmJgotCSAgICB2ZXRoLT5oX3ZsYW5fcHJvdG8g
IT0gaHRvbnMoRVRIX1BfODAyMUFEKSkKKwlpZiAoIWV0aF90eXBlX3ZsYW4odmV0aC0+aF92bGFu
X3Byb3RvKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKIAkqdmxhbl90Y2kgPSBudG9ocyh2ZXRoLT5o
X3ZsYW5fVENJKTsKQEAgLTQ4OCw3ICs1MDQsNyBAQCBzdGF0aWMgaW5saW5lIF9fYmUxNiBfX3Zs
YW5fZ2V0X3Byb3RvY29sKHN0cnVjdCBza19idWZmICpza2IsIF9fYmUxNiB0eXBlLAogCSAqIHBy
ZXNlbnQgYXQgbWFjX2xlbiAtIFZMQU5fSExFTiAoaWYgbWFjX2xlbiA+IDApLCBvciBhdAogCSAq
IEVUSF9ITEVOIG90aGVyd2lzZQogCSAqLwotCWlmICh0eXBlID09IGh0b25zKEVUSF9QXzgwMjFR
KSB8fCB0eXBlID09IGh0b25zKEVUSF9QXzgwMjFBRCkpIHsKKwlpZiAoZXRoX3R5cGVfdmxhbih0
eXBlKSkgewogCQlpZiAodmxhbl9kZXB0aCkgewogCQkJaWYgKFdBUk5fT04odmxhbl9kZXB0aCA8
IFZMQU5fSExFTikpCiAJCQkJcmV0dXJuIDA7CkBAIC01MDYsOCArNTIyLDcgQEAgc3RhdGljIGlu
bGluZSBfX2JlMTYgX192bGFuX2dldF9wcm90b2NvbChzdHJ1Y3Qgc2tfYnVmZiAqc2tiLCBfX2Jl
MTYgdHlwZSwKIAkJCXZoID0gKHN0cnVjdCB2bGFuX2hkciAqKShza2ItPmRhdGEgKyB2bGFuX2Rl
cHRoKTsKIAkJCXR5cGUgPSB2aC0+aF92bGFuX2VuY2Fwc3VsYXRlZF9wcm90bzsKIAkJCXZsYW5f
ZGVwdGggKz0gVkxBTl9ITEVOOwotCQl9IHdoaWxlICh0eXBlID09IGh0b25zKEVUSF9QXzgwMjFR
KSB8fAotCQkJIHR5cGUgPT0gaHRvbnMoRVRIX1BfODAyMUFEKSk7CisJCX0gd2hpbGUgKGV0aF90
eXBlX3ZsYW4odHlwZSkpOwogCX0KIAogCWlmIChkZXB0aCkKQEAgLTU3Miw4ICs1ODcsNyBAQCBz
dGF0aWMgaW5saW5lIHZvaWQgdmxhbl9zZXRfZW5jYXBfcHJvdG8oc3RydWN0IHNrX2J1ZmYgKnNr
YiwKIHN0YXRpYyBpbmxpbmUgYm9vbCBza2Jfdmxhbl90YWdnZWQoY29uc3Qgc3RydWN0IHNrX2J1
ZmYgKnNrYikKIHsKIAlpZiAoIXNrYl92bGFuX3RhZ19wcmVzZW50KHNrYikgJiYKLQkgICAgbGlr
ZWx5KHNrYi0+cHJvdG9jb2wgIT0gaHRvbnMoRVRIX1BfODAyMVEpICYmCi0JCSAgIHNrYi0+cHJv
dG9jb2wgIT0gaHRvbnMoRVRIX1BfODAyMUFEKSkpCisJICAgIGxpa2VseSghZXRoX3R5cGVfdmxh
bihza2ItPnByb3RvY29sKSkpCiAJCXJldHVybiBmYWxzZTsKIAogCXJldHVybiB0cnVlOwpAQCAt
NTkzLDE1ICs2MDcsMTQgQEAgc3RhdGljIGlubGluZSBib29sIHNrYl92bGFuX3RhZ2dlZF9tdWx0
aShjb25zdCBzdHJ1Y3Qgc2tfYnVmZiAqc2tiKQogCWlmICghc2tiX3ZsYW5fdGFnX3ByZXNlbnQo
c2tiKSkgewogCQlzdHJ1Y3Qgdmxhbl9ldGhoZHIgKnZlaDsKIAotCQlpZiAobGlrZWx5KHByb3Rv
Y29sICE9IGh0b25zKEVUSF9QXzgwMjFRKSAmJgotCQkJICAgcHJvdG9jb2wgIT0gaHRvbnMoRVRI
X1BfODAyMUFEKSkpCisJCWlmIChsaWtlbHkoIWV0aF90eXBlX3ZsYW4ocHJvdG9jb2wpKSkKIAkJ
CXJldHVybiBmYWxzZTsKIAogCQl2ZWggPSAoc3RydWN0IHZsYW5fZXRoaGRyICopc2tiLT5kYXRh
OwogCQlwcm90b2NvbCA9IHZlaC0+aF92bGFuX2VuY2Fwc3VsYXRlZF9wcm90bzsKIAl9CiAKLQlp
ZiAocHJvdG9jb2wgIT0gaHRvbnMoRVRIX1BfODAyMVEpICYmIHByb3RvY29sICE9IGh0b25zKEVU
SF9QXzgwMjFBRCkpCisJaWYgKCFldGhfdHlwZV92bGFuKHByb3RvY29sKSkKIAkJcmV0dXJuIGZh
bHNlOwogCiAJcmV0dXJuIHRydWU7Ci0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KZGV2IG1haWxpbmcgbGlzdApkZXZAb3BlbnZzd2l0Y2gu
b3JnCmh0dHA6Ly9vcGVudnN3aXRjaC5vcmcvbWFpbG1hbi9saXN0aW5mby9kZXYK