git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
libertas
/
scan.c
diff --git
a/drivers/net/wireless/libertas/scan.c
b/drivers/net/wireless/libertas/scan.c
index
9014950
..
8124db3
100644
(file)
--- a/
drivers/net/wireless/libertas/scan.c
+++ b/
drivers/net/wireless/libertas/scan.c
@@
-692,7
+692,7
@@
static int lbs_process_bss(struct bss_descriptor *bss,
bss->wpa_ie_len);
} else if (pos[1] >= MARVELL_MESH_IE_LENGTH &&
pos[2] == 0x00 && pos[3] == 0x50 &&
- pos[4] == 0x43 && pos[
4
] == 0x04) {
+ pos[4] == 0x43 && pos[
5
] == 0x04) {
lbs_deb_scan("got mesh IE\n");
bss->mesh = 1;
} else {