From a0a391556f262eef693a751fc7a420d5873ff6ba Mon Sep 17 00:00:00 2001
From: Rich Lane <rlane@bigswitch.com>
Date: Tue, 19 Feb 2013 11:10:30 -0800
Subject: [PATCH] --- yaml --- r: 361450 b: refs/heads/master c:
 17b682a04841233f827073b327c6533e478dfcd4 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/openvswitch/flow.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f359a9b20b8d..990a0004e7cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a15ff76c955d17cf58313097e4a24124da022b1d
+refs/heads/master: 17b682a04841233f827073b327c6533e478dfcd4
diff --git a/trunk/net/openvswitch/flow.c b/trunk/net/openvswitch/flow.c
index c3294cebc4f2..0c98d406124b 100644
--- a/trunk/net/openvswitch/flow.c
+++ b/trunk/net/openvswitch/flow.c
@@ -484,7 +484,11 @@ static __be16 parse_ethertype(struct sk_buff *skb)
 		return htons(ETH_P_802_2);
 
 	__skb_pull(skb, sizeof(struct llc_snap_hdr));
-	return llc->ethertype;
+
+	if (ntohs(llc->ethertype) >= 1536)
+		return llc->ethertype;
+
+	return htons(ETH_P_802_2);
 }
 
 static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,