From 4f92d5a169eb95e9adadb7b5750cdebbfafe4ca8 Mon Sep 17 00:00:00 2001
From: Eldad Zack <eldad@fogrefinery.com>
Date: Tue, 8 May 2012 00:09:35 +0200
Subject: [PATCH] --- yaml --- r: 306927 b: refs/heads/master c:
 000092b0b4793caf831f6016fa69d25abba31e51 h: refs/heads/master i:   306925:
 c3a7b23574170e24357031e314c80bb1d95167a0   306923:
 f2f1745ce5c70edebef9c417aec06dfceaf5c371   306919:
 7fea220e2c95bc01f4c7bb368767f5c2865b1a56   306911:
 d87cd7f997400d2b6c7d5bc2fb98b9b2002e3c79 v: v3

---
 [refs]                          | 2 +-
 trunk/net/bluetooth/bnep/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 414646be35d8..60c3b8070501 100644
--- 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
index a779ec703323..4fab4362b5aa 100644
--- 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));