diff options
| author | John W. Linville | 2010-09-21 21:49:14 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-09-21 21:49:14 +0200 |
| commit | b618f6f885579a6237e5bf4582fa6167972ddef4 (patch) | |
| tree | b11508178570b98ce9cb2d76ecebd046a6f0e77c /drivers/net/wireless/libertas | |
| parent | bridge : Sanitize skb before it enters the IP stack (diff) | |
| parent | ath9k: make the driver specific rate control module optional (diff) | |
| download | kernel-qcow2-linux-b618f6f885579a6237e5bf4582fa6167972ddef4.tar.gz kernel-qcow2-linux-b618f6f885579a6237e5bf4582fa6167972ddef4.tar.xz kernel-qcow2-linux-b618f6f885579a6237e5bf4582fa6167972ddef4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
drivers/net/wireless/ath/ath5k/base.c
Diffstat (limited to 'drivers/net/wireless/libertas')
| -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 317f086ced0a..1bbdb14f7d76 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c @@ -481,7 +481,6 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp; int bsssize; const u8 *pos; - u16 nr_sets; const u8 *tsfdesc; int tsfsize; int i; @@ -490,12 +489,11 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, lbs_deb_enter(LBS_DEB_CFG80211); bsssize = get_unaligned_le16(&scanresp->bssdescriptsize); - nr_sets = le16_to_cpu(scanresp->nr_sets); lbs_deb_scan("scan response: %d BSSs (%d bytes); resp size %d bytes\n", - nr_sets, bsssize, le16_to_cpu(resp->size)); + scanresp->nr_sets, bsssize, le16_to_cpu(resp->size)); - if (nr_sets == 0) { + if (scanresp->nr_sets == 0) { ret = 0; goto done; } 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) memset(&cmd, 0, sizeof(cmd)); cmd.hdr.size = cpu_to_le16(sizeof(cmd)); cmd.action = cpu_to_le16(CMD_ACT_BT_ACCESS_SET_INVERT); - cmd.id = !!inverted; + cmd.id = cpu_to_le32(!!inverted); ret = lbs_cmd_with_response(priv, CMD_BT_ACCESS, &cmd); |