---

yaml --- r: 361450 b: refs/heads/master c: 17b682a h: refs/heads/master v: v3
git-mirror · Feb 23, 2013 · a0a3915 · a0a3915
1 parent 4d22ba7
commit a0a3915
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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,