diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-16 15:38:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 15:38:11 -0400 |
| commit | 05f8f25276ea8c7d41b3649890d6eaf179e67a81 (patch) | |
| tree | 49ff95cecc0dc2237b773ea8162f247d3d9c8582 /net/bluetooth/bnep | |
| parent | 4416f5d2ac986923fcb6e42419c8a048dfda7584 (diff) | |
| parent | d839c81372d1f0caee47f87b26a68e91d4ff3847 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/bnep')
| -rw-r--r-- | net/bluetooth/bnep/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index a779ec703323..4fab4362b5aa 100644 --- 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) | |||
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | /* Strip 802.1p header */ | 342 | /* Strip 802.1p header */ |
| 343 | if (ntohs(s->eh.h_proto) == 0x8100) { | 343 | if (ntohs(s->eh.h_proto) == ETH_P_8021Q) { |
| 344 | if (!skb_pull(skb, 4)) | 344 | if (!skb_pull(skb, 4)) |
| 345 | goto badframe; | 345 | goto badframe; |
| 346 | s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2)); | 346 | s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2)); |