diff options
-rw-r--r-- | drivers/net/wireless/libertas/cfg.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/mesh.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index 03b7108505e7..cb3b855d949c 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c | |||
@@ -479,7 +479,6 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, | |||
479 | struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp; | 479 | struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp; |
480 | int bsssize; | 480 | int bsssize; |
481 | const u8 *pos; | 481 | const u8 *pos; |
482 | u16 nr_sets; | ||
483 | const u8 *tsfdesc; | 482 | const u8 *tsfdesc; |
484 | int tsfsize; | 483 | int tsfsize; |
485 | int i; | 484 | int i; |
@@ -488,12 +487,11 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, | |||
488 | lbs_deb_enter(LBS_DEB_CFG80211); | 487 | lbs_deb_enter(LBS_DEB_CFG80211); |
489 | 488 | ||
490 | bsssize = get_unaligned_le16(&scanresp->bssdescriptsize); | 489 | bsssize = get_unaligned_le16(&scanresp->bssdescriptsize); |
491 | nr_sets = le16_to_cpu(scanresp->nr_sets); | ||
492 | 490 | ||
493 | lbs_deb_scan("scan response: %d BSSs (%d bytes); resp size %d bytes\n", | 491 | lbs_deb_scan("scan response: %d BSSs (%d bytes); resp size %d bytes\n", |
494 | nr_sets, bsssize, le16_to_cpu(resp->size)); | 492 | scanresp->nr_sets, bsssize, le16_to_cpu(resp->size)); |
495 | 493 | ||
496 | if (nr_sets == 0) { | 494 | if (scanresp->nr_sets == 0) { |
497 | ret = 0; | 495 | ret = 0; |
498 | goto done; | 496 | goto done; |
499 | } | 497 | } |
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c index 194762ab0142..acf3bf63ee33 100644 --- a/drivers/net/wireless/libertas/mesh.c +++ b/drivers/net/wireless/libertas/mesh.c | |||
@@ -574,7 +574,7 @@ int lbs_mesh_bt_set_inverted(struct lbs_private *priv, bool inverted) | |||
574 | memset(&cmd, 0, sizeof(cmd)); | 574 | memset(&cmd, 0, sizeof(cmd)); |
575 | cmd.hdr.size = cpu_to_le16(sizeof(cmd)); | 575 | cmd.hdr.size = cpu_to_le16(sizeof(cmd)); |
576 | cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_SET_INVERT); | 576 | cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_SET_INVERT); |
577 | cmd.id = !!inverted; | 577 | cmd.id = cpu_to_le32(!!inverted); |
578 | 578 | ||
579 | ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd); | 579 | ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd); |
580 | 580 | ||