aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/scan.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-09 23:30:44 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-09 23:30:44 -0800
commit4b53b361e0fbb2390f1d98ed9eede8e0c9a887b6 (patch)
treebf4b8635de66f50eb1d28f2d9e93a04adc4053f5 /drivers/net/wireless/libertas/scan.c
parent4cdc44a231f906a6ec586637e6e4c4c216679da4 (diff)
parent99e0fca6740b98aed1f604fc2e0acbdbc9e7578a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
-rw-r--r--drivers/net/wireless/libertas/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 57f6c12cda2..00a57ed78af 100644
--- 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 {