Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2012-05-22 15:18:06 -04:00
parent 31a67102f4 05f8f25276
commit a0d0d1685f
173 changed files with 6623 additions and 5504 deletions
--- a/net/bluetooth/bnep/core.c
+++ b/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));