---

yaml --- r: 306927 b: refs/heads/master c: 000092b h: refs/heads/master i: 306925: c3a7b23 306923: f2f1745 306919: 7fea220 306911: d87cd7f v: v3
git-mirror · May 9, 2012 · 4f92d5a · 4f92d5a
1 parent f0fef0a
commit 4f92d5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94122bbe9c8c4ad7ba9f02f9a30bfc95672c404e
+refs/heads/master: 000092b0b4793caf831f6016fa69d25abba31e51
diff --git a/trunk/net/bluetooth/bnep/core.c b/trunk/net/bluetooth/bnep/core.c
@@ -340,7 +340,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 	}
 
 	/* Strip 802.1p header */
-	if (ntohs(s->eh.h_proto) == 0x8100) {
+	if (ntohs(s->eh.h_proto) == ETH_P_8021Q) {
 		if (!skb_pull(skb, 4))
 			goto badframe;
 		s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2));